[keycloak-dev] Git History w/merges of upstream/master

[Marek Posolda]

I don't have strong opinion on it. I am personally always doing rebase 
before sending PR to the master. And I agree that rebase is cleaner than 
merge.

But unfortunately if you want to merge pull requests automatically on 
github (Clicking on button "Merge pull request" ), github will always 
merge the PR, not rebase. For the really linear commit history, we will 
need to avoid merging PRs in the github UI, which is more work for the 
person, who is merging the PR...

Marek

On 11.7.2015 03:54, Scott Rossillo wrote:
> Not the biggest deal, but always see commits like:
>
> "Merge remote-tracking branch 'upstream/master’ commits"
>
> If you `git pull —rebase` you can avoid these and the project history will be a lot cleaner.
>
> ~ Scott
>
>
>
>
> _______________________________________________
> keycloak-dev mailing list
> keycloak-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/keycloak-dev