[keycloak-dev] Merging PRs

[Stian Thorgersen]

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 at 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
> Tel. +49 30 726112-485 | Fax +49 30 726112-100 |
> Sebastian.Schuster at 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 at 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 at 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 at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/keycloak-dev
>