<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, May 9, 2016 at 4:05 PM, Max Rydahl Andersen <span dir="ltr"><<a href="mailto:manderse@redhat.com" target="_blank">manderse@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi,<br>
<br>
In April, GitHub introduced squashed merging[1] to their web UI. It's now<br>
OK to use the big green "merge" button for PRs in Github for openshift, as<br>
commits in a PR will be squashed commits and put at the tip of the branch. It's<br>
not as nice as having rebase support but that's better than before.<br>
</blockquote>
<br></span>
Still not a fan of the green button - should only be used for most trivial things.<br>
<br></blockquote><div><br></div><div>The PR should _always_ be tested manually _first_! If it works locally, then instead of pushing the local merge back to origin, it's still preferable to use the green button to see the PR merged, not closed, in GH.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
I would say if we have PR jobs setup that verifies the new tests passes the git green button would be great to use with this new setup :)<br>
<br>
But sure, its great github at least allow some smaller fixes being merged in a simpler way.<span class=""><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
It works beautifully for >90% of the PRs (from my very unscientific<br>
estimations). However there are cases where you shouldn't use that button:<br>
<br>
- when there are merge conflicts (but the UI won't let you anyway)<br>
<br>
- if you really intend on keeping distinct commits in the PR. This is<br>
especially important when the PR contains commits from different authors.<br>
*Everything* will be squashed, only one author will remain.<br>
<br>
But there are 2 added benefits of using the merge button: it marks the PR<br>
as merged, not closed (also shown in JIRA), and it adds the PR # in the<br>
commit message, so it's easy to link back to the original PR.<br>
<br>
So I went ahead and disabled merge commits for all (I think) jbosstools<br>
repositories on GitHub, to make it easier to merge PRs (and prevent<br>
accidental merge commits). If anyone wants me to undo that change for<br>
specific repos, please lemme know.<br>
</blockquote>
<br></span>
I have a feeling this would collide with how most automatic merge PR request builders would work - but we can enable it again for such projects when we have them.<br>
<br>
/max<br>
<a href="http://about.me/maxandersen" rel="noreferrer" target="_blank">http://about.me/maxandersen</a><br>
</blockquote></div><br></div></div>