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