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 > > > >> > > > > > > >
