<div dir="ltr">Today Github introduced "Rebase and merge" button, see <a href="https://github.com/blog/2243-rebase-and-merge-pull-requests">https://github.com/blog/2243-rebase-and-merge-pull-requests</a><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Sep 22, 2016 at 4:25 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"><u></u> <div> <div style="font-family:sans-serif"><span class=""><div style="white-space:normal"> <p dir="auto"></p></div> <div style="white-space:pre-wrap"><blockquote style="border-left:2px solid #777;color:#777;margin:0 0 5px;padding-left:5px"><div dir="auto">I use the green button. Why would I not? </div></blockquote></div> </span><div style="white-space:normal"> <p dir="auto">if the PR is already rebased to master then the green button will do the right thing.<br> if the PR contains just <em>one</em> author and many commits and the last comment makes sense then the green button will almost do the right thing.</p> <p dir="auto">If the PR is not rebased to master - it will create (potentially) unnecessary git merges.<br> If the PR has multiple good commit messages - the squash will make them really hard to read.<br> If the PR has multiple authors - some of those authors will <em>not</em> be recognised as contributor.<br> If you haven't tested the PR then the green button will do the wrong thing too ;)</p> <p dir="auto">So yes, the big green button can be tempting and it <em>sometimes</em> works, but in other cases it is just wrong/bad/annoying.</p> <p dir="auto">/max</p> <p dir="auto"></p></div><div><div class="h5"> <div style="white-space:pre-wrap"><blockquote style="border-left:2px solid #777;color:#777;margin:0 0 5px;padding-left:5px"><div dir="auto"> </div><div dir="auto">/Thomas </div><div dir="auto"> </div><div dir="auto">On 09/22/2016 03:31 PM, Max Rydahl Andersen wrote: </div><blockquote style="border-left:2px solid #777;color:#999;margin:0 0 5px;padding-left:5px;border-left-color:#999"><div dir="auto">is this not just about the green button in github web ui ? </div><div dir="auto"> </div><div dir="auto">The button noone should use anyway ? :) </div><div dir="auto"> </div><div dir="auto">You can still do rebase/merges/squashes as need be on command line, right? </div><div dir="auto"> </div><div dir="auto">/max </div><div dir="auto"> </div><blockquote style="border-left:2px solid #777;color:#bbb;margin:0 0 5px;padding-left:5px;border-left-color:#bbb"><div dir="auto">Rebase to master, from the PR would - but then a merge back to master </div><div dir="auto">would still squash all the commits into 1 change at point of merge </div><div dir="auto">back into master. Thats how the git repo is setup at the moment, and </div><div dir="auto">seems wrong to me. </div><div dir="auto"> </div><div dir="auto">If a feature is worked on for a few days, across the team, and then </div><div dir="auto">pushed into a single PR to merge into master, we are destroying the </div><div dir="auto">entire history of that code. </div><div dir="auto"> </div><div dir="auto">regards, </div><div dir="auto"> </div><div dir="auto">On 21/09/16 19:18, Max Andersen wrote: </div><blockquote style="border-left:2px solid #777;color:#bbb;margin:0 0 5px;padding-left:5px;border-left-color:#bbb"><div dir="auto">Rebase keeps history does it not ? </div><div dir="auto"> </div><div dir="auto">Sent from my iPhone </div><div dir="auto"> </div><div dir="auto">On 21 Sep 2016, at 18:28, Karanbir Singh <<a href="mailto:kbsingh@redhat.com" target="_blank">kbsingh@redhat.com</a> </div><div dir="auto"><<a href="mailto:kbsingh@redhat.com" style="color:#bbb" target="_blank">mailto:kbsingh@redhat.com</a>>> wrote: </div><div dir="auto"> </div><div dir="auto">hi, </div><div dir="auto"> </div><div dir="auto">I just noticed that the only merge option for almighty-core is now </div><div dir="auto">squash-and-merge, ie. we cant retain commit history for the PR's. </div><div dir="auto">Is this by design ? </div><div dir="auto"> </div></blockquote><div dir="auto">- -- </div><div dir="auto">Karanbir Singh, Project Lead, The CentOS Project, London, UK </div><div dir="auto">Red Hat Ext. 8274455 | DID: 0044 207 009 4455 </div><div dir="auto"> </div></blockquote><div dir="auto"> </div><div dir="auto">/max </div><div dir="auto"><a href="http://about.me/maxandersen" style="color:#999" target="_blank">http://about.me/maxandersen</a> </div><div dir="auto"> </div><div dir="auto">______________________________<wbr>_________________ </div><div dir="auto">almighty-public mailing list </div><div dir="auto"><a href="mailto:almighty-public@redhat.com" target="_blank">almighty-public@redhat.com</a> </div><div dir="auto"><a href="https://www.redhat.com/mailman/listinfo/almighty-public" style="color:#999" target="_blank">https://www.redhat.com/<wbr>mailman/listinfo/almighty-<wbr>public</a> </div></blockquote><div dir="auto"> </div></blockquote></div> </div></div><div style="white-space:normal"> <p dir="auto">/max<br> <a href="http://about.me/maxandersen" style="color:#3983c4" target="_blank">http://about.me/maxandersen</a></p> </div> </div> </div> <br>______________________________<wbr>_________________<br> almighty-public mailing list<br> <a href="mailto:almighty-public@redhat.com">almighty-public@redhat.com</a><br> <a href="https://www.redhat.com/mailman/listinfo/almighty-public" rel="noreferrer" target="_blank">https://www.redhat.com/<wbr>mailman/listinfo/almighty-<wbr>public</a><br> <br></blockquote></div><br></div>