Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-30 Thread Ivan Pavlukhin
Great news! Thank you Pavel! чт, 30 янв. 2020 г. в 14:14, Pavel Tupitsyn : > > It's done, only Squash mode is enabled in GitHub UI. > > On Mon, Jan 27, 2020 at 5:05 PM Pavel Tupitsyn wrote: > > > INFRA ticket filed: > > https://issues.apache.org/jira/browse/INFRA-19778 > > > > On Mon, Jan 27, 202

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-30 Thread Pavel Tupitsyn
It's done, only Squash mode is enabled in GitHub UI. On Mon, Jan 27, 2020 at 5:05 PM Pavel Tupitsyn wrote: > INFRA ticket filed: > https://issues.apache.org/jira/browse/INFRA-19778 > > On Mon, Jan 27, 2020 at 4:38 PM Alexey Zinoviev > wrote: > >> I used squash for last two years, no problemo wi

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Pavel Tupitsyn
INFRA ticket filed: https://issues.apache.org/jira/browse/INFRA-19778 On Mon, Jan 27, 2020 at 4:38 PM Alexey Zinoviev wrote: > I used squash for last two years, no problemo with that. Of course we > should have 1 commit to 1 PR relationship, don't put all your commits to > the table:) > > пн, 27

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Alexey Zinoviev
I used squash for last two years, no problemo with that. Of course we should have 1 commit to 1 PR relationship, don't put all your commits to the table:) пн, 27 янв. 2020 г. в 15:50, Alexei Scherbakov : > Petr Ivanov > > The script works great for me under windows. > > пн, 27 янв. 2020 г. в 15:3

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Alexei Scherbakov
Petr Ivanov The script works great for me under windows. пн, 27 янв. 2020 г. в 15:33, Petr Ivanov : > Unfortunately, I have no power at Apache's GitHub repositories. > Ticket for INFRA maybe the best way to solve the issue. > > > > On 27 Jan 2020, at 15:23, Ivan Pavlukhin wrote: > > > > But the

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Petr Ivanov
Unfortunately, I have no power at Apache's GitHub repositories. Ticket for INFRA maybe the best way to solve the issue. > On 27 Jan 2020, at 15:23, Ivan Pavlukhin wrote: > > But there is still the question how to configure it. Petr, can you > help here? Or somebody else? Or INFRA ticket should

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Ivan Pavlukhin
But there is still the question how to configure it. Petr, can you help here? Or somebody else? Or INFRA ticket should be created? пн, 27 янв. 2020 г. в 15:05, Dmitriy Pavlov : > > I always merge PRs from GitHub when possible. By doing it I can keep my > Git's local state unmodified. > > So I sugg

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Dmitriy Pavlov
I always merge PRs from GitHub when possible. By doing it I can keep my Git's local state unmodified. So I suggest using squash and merge. пн, 27 янв. 2020 г. в 14:59, Maxim Muzafarov : > +1 to keep only "squash" merge option > > On Mon, 27 Jan 2020 at 14:39, Pavel Tupitsyn wrote: > > > > Mergi

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Maxim Muzafarov
+1 to keep only "squash" merge option On Mon, 27 Jan 2020 at 14:39, Pavel Tupitsyn wrote: > > Merging from GitHub is very convenient indeed, much faster and safer than > anything else. > > And yes, GitHub provides a way to disable Merge and Rebase, leaving only > Squash option: > https://help.git

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Pavel Tupitsyn
Merging from GitHub is very convenient indeed, much faster and safer than anything else. And yes, GitHub provides a way to disable Merge and Rebase, leaving only Squash option: https://help.github.com/en/github/administering-a-repository/configuring-commit-squashing-for-pull-requests However, I

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Petr Ivanov
Iliya, How well does this script work under non-linux operations systems? > On 27 Jan 2020, at 14:24, Ilya Kasnacheev wrote: > > Hello! > > I implore everybody to use scripts/apply-pull-request.sh, I never had any > problems with it. The only downside is that cherry-peek needs to be clean. >

Re: [DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Ilya Kasnacheev
Hello! I implore everybody to use scripts/apply-pull-request.sh, I never had any problems with it. The only downside is that cherry-peek needs to be clean. Regards, -- Ilya Kasnacheev пн, 27 янв. 2020 г. в 14:22, Ivan Pavlukhin : > Today I opened for myself a possibility to merge PR via GitHu

[DISCUSS] Merge PR via GitHub web UI

2020-01-27 Thread Ivan Pavlukhin
Today I opened for myself a possibility to merge PR via GitHub. And GitHub allows 3 usual options to do a merge (merge commit, rebase, squash). And "merge commit" is a default option but an illegal one according to Apache Ignite usual practices. So, I wonder is it somehow possible to configure it