<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<p><br>
</p>
<br>
<div class="moz-cite-prefix">On 09/27/2016 08:26 AM, Max Rydahl
Andersen wrote:<br>
</div>
<blockquote
cite="mid:3AC766C2-BE20-4567-8078-F092CA9D5AF2@redhat.com"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
<div style="font-family:sans-serif">
<div style="white-space:normal">
<p dir="auto">On 27 Sep 2016, at 16:53, Konrad Kleine wrote:</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">No it keeps the original commits and just rebases them.
</div></blockquote></div>
<div style="white-space:normal">
<p dir="auto">Notice what Andrew stated: "Rebase, then squash,
then merge " </p>
<p dir="auto">Unless I misunderstand that will <em>not</em>
keep original commits if more than 1 commit since there is a
squash.</p>
</div>
</div>
</blockquote>
<br>
Exactly. "Squash and merge" does rebase, squash and merge. It
doesn't keep original commits if more than 1.<br>
So both "Rebase and merge" and "Squash and merge" options are
useful.<br>
<br>
Thanks.<br>
<br>
<blockquote
cite="mid:3AC766C2-BE20-4567-8078-F092CA9D5AF2@redhat.com"
type="cite">
<div style="font-family:sans-serif">
<div style="white-space:normal">
<p dir="auto">/max</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">
</div><div dir="auto">On Mon, Sep 26, 2016 at 5:00 PM, Max Rydahl Andersen <a class="moz-txt-link-rfc2396E" href="mailto:manderse@redhat.com"><manderse@redhat.com></a>
</div><div dir="auto">wrote:
</div><div dir="auto">
</div><blockquote style="border-left:2px solid #777; color:#999; margin:0 0 5px; padding-left:5px; border-left-color:#999"><div dir="auto">On 26 Sep 2016, at 16:28, Andrew Lee Rubinger wrote:
</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">Now all we need: "Rebase, then squash, then merge" :)
</div></blockquote><div dir="auto">
</div><div dir="auto">I believe that is equivalent to just "Squash and merge"...is it not ?
</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">
</div><div dir="auto">On Mon, Sep 26, 2016 at 10:24 AM, Max Rydahl Andersen <
</div></blockquote><div dir="auto"><a class="moz-txt-link-abbreviated" href="mailto:manderse@redhat.com">manderse@redhat.com</a>>
</div><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><div dir="auto">wrote:
</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">Yay! better :)
</div><div dir="auto">
</div><div dir="auto">Today Github introduced "Rebase and merge" button, see
</div><div dir="auto"><a moz-do-not-send="true" href="https://github.com/blog/2243-rebase-and-merge-pull-requests" style="color:#BBB">https://github.com/blog/2243-rebase-and-merge-pull-requests</a>
</div><div dir="auto">
</div><div dir="auto">On Thu, Sep 22, 2016 at 4:25 PM, Max Rydahl Andersen <
</div></blockquote></blockquote><div dir="auto"><a class="moz-txt-link-abbreviated" href="mailto:manderse@redhat.com">manderse@redhat.com</a>>
</div><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><div dir="auto">wrote:
</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">I use the green button. Why would I not?
</div><div dir="auto">
</div><div dir="auto">if the PR is already rebased to master then the green button will do
</div></blockquote></blockquote></blockquote><div dir="auto">the
</div><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><div dir="auto">right thing.
</div><div dir="auto">if the PR contains just *one* author and many commits and the last
</div><div dir="auto">comment makes sense then the green button will almost do the right
</div></blockquote></blockquote></blockquote><div dir="auto">thing.
</div><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><blockquote style="border-left:2px solid #777; color:#BBB; margin:0 0 5px; padding-left:5px; border-left-color:#BBB"><div dir="auto">
</div><div dir="auto">If the PR is not rebased to master - it will create (potentially)
</div><div dir="auto">unnecessary git merges.
</div><div dir="auto">If the PR has multiple good commit messages - the squash will make them
</div><div dir="auto">really hard to read.
</div><div dir="auto">If the PR has multiple authors - some of those authors will *not* be
</div><div dir="auto">recognised as contributor.
</div><div dir="auto">If you haven't tested the PR then the green button will do the wrong
</div><div dir="auto">thing too ;)
</div><div dir="auto">
</div><div dir="auto">So yes, the big green button can be tempting and it *sometimes* works,
</div><div dir="auto">but in other cases it is just wrong/bad/annoying.
</div><div dir="auto">
</div><div dir="auto">/max
</div><div dir="auto">
</div><div dir="auto">/Thomas
</div><div dir="auto">On 09/22/2016 03:31 PM, Max Rydahl Andersen wrote:
</div><div dir="auto">
</div><div dir="auto">is this not just about the green button in github web ui ?
</div><div dir="auto">The button noone should use anyway ? :)
</div><div dir="auto">You can still do rebase/merges/squashes as need be on command line,
</div><div dir="auto">right?
</div><div dir="auto">/max
</div><div dir="auto">
</div><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">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">regards,
</div><div dir="auto">On 21/09/16 19:18, Max Andersen wrote:
</div><div dir="auto">
</div><div dir="auto">Rebase keeps history does it not ?
</div><div dir="auto">Sent from my iPhone
</div><div dir="auto">On 21 Sep 2016, at 18:28, Karanbir Singh <<a class="moz-txt-link-abbreviated" href="mailto:kbsingh@redhat.com">kbsingh@redhat.com</a>
</div><div dir="auto"><<a moz-do-not-send="true" href="mailto:kbsingh@redhat.com" style="color:#BBB">mailto:kbsingh@redhat.com</a> <a class="moz-txt-link-rfc2396E" href="mailto:kbsingh@redhat.com"><kbsingh@redhat.com></a>>> wrote:
</div><div dir="auto">hi,
</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><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><div dir="auto">/max
</div><div dir="auto"><a moz-do-not-send="true" href="http://about.me/maxandersen" style="color:#BBB">http://about.me/maxandersen</a>
</div><div dir="auto">_______________________________________________
</div><div dir="auto">almighty-public mailing list
</div><div dir="auto"><a class="moz-txt-link-abbreviated" href="mailto:almighty-public@redhat.com">almighty-public@redhat.com</a>
</div><div dir="auto"><a moz-do-not-send="true" href="https://www.redhat.com/mailman/listinfo/almighty-public" style="color:#BBB">https://www.redhat.com/mailman/listinfo/almighty-public</a>
</div><div dir="auto">
</div><div dir="auto">/max
</div><div dir="auto"><a moz-do-not-send="true" href="http://about.me/maxandersen" style="color:#BBB">http://about.me/maxandersen</a>
</div><div dir="auto">
</div><div dir="auto">_______________________________________________
</div><div dir="auto">almighty-public mailing list
</div><div dir="auto"><a class="moz-txt-link-abbreviated" href="mailto:almighty-public@redhat.com">almighty-public@redhat.com</a>
</div><div dir="auto"><a moz-do-not-send="true" href="https://www.redhat.com/mailman/listinfo/almighty-public" style="color:#BBB">https://www.redhat.com/mailman/listinfo/almighty-public</a>
</div><div dir="auto">
</div><div dir="auto">
</div></blockquote><div dir="auto">/max
</div><div dir="auto"><a moz-do-not-send="true" href="http://about.me/maxandersen" style="color:#BBB">http://about.me/maxandersen</a>
</div><div dir="auto">
</div><div dir="auto">_______________________________________________
</div><div dir="auto">almighty-public mailing list
</div><div dir="auto"><a class="moz-txt-link-abbreviated" href="mailto:almighty-public@redhat.com">almighty-public@redhat.com</a>
</div><div dir="auto"><a moz-do-not-send="true" href="https://www.redhat.com/mailman/listinfo/almighty-public" style="color:#BBB">https://www.redhat.com/mailman/listinfo/almighty-public</a>
</div><div dir="auto">
</div><div dir="auto">
</div></blockquote><div dir="auto">
</div><div dir="auto">--
</div><div dir="auto">Red Hat Developer Programs Architecture
</div><div dir="auto">@ALRubinger
</div></blockquote><div dir="auto">
</div><div dir="auto">
</div><div dir="auto">
</div><div dir="auto">
</div><div dir="auto">/max
</div><div dir="auto"><a moz-do-not-send="true" href="http://about.me/maxandersen" style="color:#999">http://about.me/maxandersen</a>
</div><div dir="auto">
</div><div dir="auto">_______________________________________________
</div><div dir="auto">almighty-public mailing list
</div><div dir="auto"><a class="moz-txt-link-abbreviated" href="mailto:almighty-public@redhat.com">almighty-public@redhat.com</a>
</div><div dir="auto"><a moz-do-not-send="true" href="https://www.redhat.com/mailman/listinfo/almighty-public" style="color:#999">https://www.redhat.com/mailman/listinfo/almighty-public</a>
</div><div dir="auto">
</div></blockquote></blockquote></div>
<div style="white-space:normal">
<p dir="auto">/max<br>
<a moz-do-not-send="true" href="http://about.me/maxandersen"
style="color:#3983C4">http://about.me/maxandersen</a></p>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
almighty-public mailing list
<a class="moz-txt-link-abbreviated" href="mailto:almighty-public@redhat.com">almighty-public@redhat.com</a>
<a class="moz-txt-link-freetext" href="https://www.redhat.com/mailman/listinfo/almighty-public">https://www.redhat.com/mailman/listinfo/almighty-public</a>
</pre>
</blockquote>
<br>
</body>
</html>