<div dir="ltr"><div><div><div><div>Hi,<br><br></div>I agree with Aslak that whole commit history is relevant. Squash forces you to decompose the problem into multiple smaller steps if you want to have meaningful history.<br><br></div>No matter what your opinion is, IMHO this kind of changes should be discussed in team *before* applying changes to Github repo.<br><br></div>Regards,<br></div>Pavol<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Sep 1, 2016 at 12:26 PM, Aslak Knutsen <span dir="ltr"><<a href="mailto:aslak@redhat.com" target="_blank">aslak@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><span class="">On Thu, Sep 1, 2016 at 11:54 AM, Karanbir Singh <span dir="ltr"><<a href="mailto:kbsingh@redhat.com" target="_blank">kbsingh@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>-----BEGIN PGP SIGNED MESSAGE-----<br>
Hash: SHA1<br>
<br>
</span><span>On 01/09/16 02:03, Aslak Knutsen wrote:<br>
> I'm assuming this change is related to PR to Master CI auto merge<br>
> or similar, but any particular reason why 'merge' vs<br>
> 'squash/rebase' for this part? (beyond 'that's what the software<br>
> supports') ?<br>
<br>
</span>This was really just to make sure that if a PR comes through, the<br>
commit history for the PR is retained once its merged in - otherwise<br>
in the squash model, github will consolidate all the commits down to 1<br>
; atleast to me that seems counter productive.<br></blockquote><div><br></div></span><div>Yeah, GitHub get's that wrong. :)</div><div><br></div><div>With merge, you assume the PR history is relevant to upstream;</div><div><a href="https://github.com/almighty/almighty-core/pull/111/commits" target="_blank">https://github.com/almighty/<wbr>almighty-core/pull/111/commits</a><br></div><div><br></div><div>The GitHub Squash allow you to do a PR cleanup in UI before it going upstream,</div><div>with Merge you're forced to do it locally. (assuming you want a commit to have any meaning</div><div>in upstream and not just be a developers braindump/error log)</div><div><br></div><div>But Squash is really just intended to be a manual thing as a automated process</div><div>wouldn't know how to make any sense out of it anyway. </div><span class="HOEnZb"><font color="#888888"><div><br></div><div>-aslak-</div></font></span><span class=""><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<span><br>
regards,<br>
<br>
- --<br>
Karanbir Singh, Project Lead, The CentOS Project, London, UK<br>
Red Hat Ext. 8274455 | DID: 0044 207 009 4455<br>
-----BEGIN PGP SIGNATURE-----<br>
Version: GnuPG v2.0.22 (GNU/Linux)<br>
<br>
</span>iQEcBAEBAgAGBQJXx/ryAAoJEI3Oi2<wbr>Mx7xbtD8cH/1nqVwaRRvEyMOOND6oI<wbr>Qdb8<br>
nQrDLqBAjeKwywTAgf8G2or3Fk7nB/<wbr>Y7e5vWzsx2tvyEMWg6stCPypydFqKd<wbr>tvkk<br>
eoQiWK3HI5lIhbpRDmIc/YZjy+09Xf<wbr>4yPaZs690dTiK1B0m3Zkgm2J0MJ6WR<wbr>Wpxn<br>
AVmhT9qgTQMR6fWqa1N+Hut59Qi6N1<wbr>dGbEXEsBZslP7pD96HJocEBwkkaKMY<wbr>8Ay0<br>
OwBHph3r1NddI2uhg9I78oVCCeNj6R<wbr>DseIQOK/26MymYp5FCsiBiCUuRHIA/<wbr>+42W<br>
EHGmO51xwMmREyZ3hvYAZZ9dPjF/5J<wbr>+iskp6hMfgW5Z4nTdvToEpkb8cRwNR<wbr>4Ns=<br>
=gc97<br>
-----END PGP SIGNATURE-----<br>
</blockquote></span></div><br></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>