Not a problem with PRs. I'd just say rebase before sending w PR rather than merging upstream/master. <br><br>I was just suggesting anyway. Not a real issue. <br><div class="gmail_quote"><div dir="ltr">On Sat, Jul 11, 2015 at 5:06 AM Marek Posolda <<a href="mailto:mposolda@redhat.com">mposolda@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I don't have strong opinion on it. I am personally always doing rebase<br>
before sending PR to the master. And I agree that rebase is cleaner than<br>
merge.<br>
<br>
But unfortunately if you want to merge pull requests automatically on<br>
github (Clicking on button "Merge pull request" ), github will always<br>
merge the PR, not rebase. For the really linear commit history, we will<br>
need to avoid merging PRs in the github UI, which is more work for the<br>
person, who is merging the PR...<br>
<br>
Marek<br>
<br>
On 11.7.2015 03:54, Scott Rossillo wrote:<br>
> Not the biggest deal, but always see commits like:<br>
><br>
> "Merge remote-tracking branch 'upstream/master’ commits"<br>
><br>
> If you `git pull —rebase` you can avoid these and the project history will be a lot cleaner.<br>
><br>
> ~ Scott<br>
><br>
><br>
><br>
><br>
> _______________________________________________<br>
> keycloak-dev mailing list<br>
> <a href="mailto:keycloak-dev@lists.jboss.org" target="_blank">keycloak-dev@lists.jboss.org</a><br>
> <a href="https://lists.jboss.org/mailman/listinfo/keycloak-dev" rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/keycloak-dev</a><br>
<br>
</blockquote></div>