Isn't it normally the other way round? Every developer should update its local branch with a rebase because you don't want to have merge commits when a developer updates its local repository but you definitely want an explicit merge commit when a major feature comes in, i.e. a pull request is merged? Best regards, Sebastian Mit freundlichen Grüßen / Best regards Dr.-Ing. Sebastian Schuster Engineering and Support (INST/ESY1) Bosch Software Innovations GmbH | Ullsteinstr. 128 | 12109 Berlin | GERMANY | www.bosch-si.com Tel. +49 30 726112-485 | Fax +49 30 726112-100 | Sebastian.Schuster(a)bosch-si.com Sitz: Berlin, Registergericht: Amtsgericht Charlottenburg; HRB 148411 B Aufsichtsratsvorsitzender: Dr.-Ing. Thorsten Lücke; Geschäftsführung: Dr.-Ing. Rainer Kallenbach, Michael Hahn -----Original Message----- From: keycloak-dev-bounces(a)lists.jboss.org [mailto:keycloak-dev-bounces@lists.jboss.org] On Behalf Of Stian Thorgersen Sent: Freitag, 17. November 2017 12:23 To: keycloak-dev <keycloak-dev(a)lists.jboss.org&gt; Subject: [keycloak-dev] Merging PRs When merging PRs always use the "Rebase and merge" option. This option puts the commits on the top of the history without a merge commit. _______________________________________________ keycloak-dev mailing list keycloak-dev(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/keycloak-dev

I had GitFlow in my mind and forgot about the “a feature is one commit” feature. I kind of liked GitFlow because it makes the development history more explicit and makes reviewing easier assuming there are nice small consistent commits. The latter is unfortunately rarely the case, that’s probably why you picked the single commit strategy… Best regards, Sebastian Mit freundlichen Grüßen / Best regards Dr.-Ing. Sebastian Schuster Engineering and Support (INST/ESY1) Bosch Software Innovations GmbH | Ullsteinstr. 128 | 12109 Berlin | GERMANY | www.bosch-si.com<http://www.bosch-si.com> Tel. +49 30 726112-485 | Fax +49 30 726112-100 | Sebastian.Schuster@bosch-si.com<mailto:Sebastian.Schuster@bosch-si.com> Sitz: Berlin, Registergericht: Amtsgericht Charlottenburg; HRB 148411 B Aufsichtsratsvorsitzender: Dr.-Ing. Thorsten Lücke; Geschäftsführung: Dr.-Ing. Rainer Kallenbach, Michael Hahn From: Stian Thorgersen [mailto:sthorger@redhat.com] Sent: Freitag, 17. November 2017 14:29 To: Schuster Sebastian (INST/ESY1) <Sebastian.Schuster(a)bosch-si.com&gt; Cc: keycloak-dev <keycloak-dev(a)lists.jboss.org&gt; Subject: Re: [keycloak-dev] Merging PRs A major new feature is sent as a single commit and should be added to the top of the Git history. The "rebase and merge" option allows this and doesn't add any "messy" merge commits. On 17 November 2017 at 13:36, Schuster Sebastian (INST/ESY1) <Sebastian.Schuster@bosch-si.com<mailto:Sebastian.Schuster@bosch-si.com>> wrote: Isn't it normally the other way round? Every developer should update its local branch with a rebase because you don't want to have merge commits when a developer updates its local repository but you definitely want an explicit merge commit when a major feature comes in, i.e. a pull request is merged? Best regards, Sebastian Mit freundlichen Grüßen / Best regards Dr.-Ing. Sebastian Schuster Engineering and Support (INST/ESY1) Bosch Software Innovations GmbH | Ullsteinstr. 128 | 12109 Berlin | GERMANY | www.bosch-si.com<http://www.bosch-si.com> Tel. +49 30 726112-485<tel:%2B49%2030%20726112-485> | Fax +49 30 726112-100<tel:%2B49%2030%20726112-100> | Sebastian.Schuster@bosch-si.com<mailto:Sebastian.Schuster@bosch-si.com> Sitz: Berlin, Registergericht: Amtsgericht Charlottenburg; HRB 148411 B Aufsichtsratsvorsitzender: Dr.-Ing. Thorsten Lücke; Geschäftsführung: Dr.-Ing. Rainer Kallenbach, Michael Hahn -----Original Message----- From: keycloak-dev-bounces@lists.jboss.org<mailto:keycloak-dev-bounces@lists.jboss.org> [mailto:keycloak-dev-bounces@lists.jboss.org<mailto:keycloak-dev-bounces@lists.jboss.org>] On Behalf Of Stian Thorgersen Sent: Freitag, 17. November 2017 12:23 To: keycloak-dev <keycloak-dev@lists.jboss.org<mailto:keycloak-dev@lists.jboss.org>> Subject: [keycloak-dev] Merging PRs When merging PRs always use the "Rebase and merge" option. This option puts the commits on the top of the history without a merge commit. _______________________________________________ keycloak-dev mailing list keycloak-dev@lists.jboss.org<mailto:keycloak-dev@lists.jboss.org> https://lists.jboss.org/mailman/listinfo/keycloak-dev