Great news! Thank you Pavel! чт, 30 янв. 2020 г. в 14:14, Pavel Tupitsyn <ptupit...@apache.org>: > > It's done, only Squash mode is enabled in GitHub UI. > > On Mon, Jan 27, 2020 at 5:05 PM Pavel Tupitsyn <ptupit...@apache.org> wrote: > > > INFRA ticket filed: > > https://issues.apache.org/jira/browse/INFRA-19778 > > > > On Mon, Jan 27, 2020 at 4:38 PM Alexey Zinoviev <zaleslaw....@gmail.com> > > 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 янв. 2020 г. в 15:50, Alexei Scherbakov < > >> alexey.scherbak...@gmail.com > >> >: > >> > >> > Petr Ivanov > >> > > >> > The script works great for me under windows. > >> > > >> > пн, 27 янв. 2020 г. в 15:33, Petr Ivanov <mr.wei...@gmail.com>: > >> > > >> > > 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 <vololo...@gmail.com> > >> wrote: > >> > > > > >> > > > 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 <dpav...@apache.org>: > >> > > >> > >> > > >> 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 <mmu...@apache.org>: > >> > > >> > >> > > >>> +1 to keep only "squash" merge option > >> > > >>> > >> > > >>> On Mon, 27 Jan 2020 at 14:39, Pavel Tupitsyn < > >> ptupit...@apache.org> > >> > > 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.github.com/en/github/administering-a-repository/configuring-commit-squashing-for-pull-requests > >> > > >>>> > >> > > >>>> > >> > > >>>> However, I don't have access to the settings. > >> > > >>>> Peter, can you please change this setting for us? > >> > > >>>> > >> > > >>>> On Mon, Jan 27, 2020 at 2:38 PM Petr Ivanov <mr.wei...@gmail.com > >> > > >> > > wrote: > >> > > >>>> > >> > > >>>>> Iliya, > >> > > >>>>> > >> > > >>>>> How well does this script work under non-linux operations > >> systems? > >> > > >>>>> > >> > > >>>>> > >> > > >>>>>> On 27 Jan 2020, at 14:24, Ilya Kasnacheev < > >> > > ilya.kasnach...@gmail.com > >> > > >>>> > >> > > >>>>> 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. > >> > > >>>>>> > >> > > >>>>>> Regards, > >> > > >>>>>> -- > >> > > >>>>>> Ilya Kasnacheev > >> > > >>>>>> > >> > > >>>>>> > >> > > >>>>>> пн, 27 янв. 2020 г. в 14:22, Ivan Pavlukhin < > >> vololo...@gmail.com > >> > >: > >> > > >>>>>> > >> > > >>>>>>> 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 to keep > >> only > >> > > >>>>>>> "squash" merge option? > >> > > >>>>>>> > >> > > >>>>>>> -- > >> > > >>>>>>> Best regards, > >> > > >>>>>>> Ivan Pavlukhin > >> > > >>>>>>> > >> > > >>>>> > >> > > >>>>> > >> > > >>> > >> > > > > >> > > > > >> > > > > >> > > > -- > >> > > > Best regards, > >> > > > Ivan Pavlukhin > >> > > > >> > > > >> > > >> > -- > >> > > >> > Best regards, > >> > Alexei Scherbakov > >> > > >> > >
-- Best regards, Ivan Pavlukhin
