<div dir="ltr"><div>AFAIK if you allow merge commits in Github repo, the merge button will always create a merge commit, even if you rebase and squash your commits in PR.<br><br></div><div>If you want to keep history reasonable linear and also keep important part of history in PR, you cannot use merge button in Github UI but you need to merge PRs manually from CLI.<br></div><div><br></div><div>Regards,<br></div>Pavol<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Sep 22, 2016 at 2:50 PM, 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:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">-----BEGIN PGP SIGNED MESSAGE-----<br>
Hash: SHA1<br>
<br>
</span><span class="">On 22/09/16 13:14, Andrew Lee Rubinger wrote:<br>
> So I don't believe in a particular policy or one-size-fits-all<br>
> approach; generally I like to rebase and squash so that a commit or<br>
> several fit neatly atop master, then test and merge.<br>
<br>
</span>+1 for giving the contributors the flexibility to do this working at<br>
the PR level.<br>
<br>
- -1 for enforcing it at the central git repo, by way of policy.<br>
<span class=""><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>iQEcBAEBAgAGBQJX49OzAAoJEI3Oi2<wbr>Mx7xbtap8H/2xk++swKr8f/<wbr>K9V0zaKatYa<br>
rekkdKC2joE9D/<wbr>XGlOQBtVvEaIO1heeBOB/<wbr>JS6YCVh3NEfq79peDKL9MgPejQyLj<br>
UebjWUHv8789LeMHxp4jW/<wbr>KJIJN9owQJXaGwHVUG2A4TGctusBxf<wbr>uvs+j+fL3Ify<br>
Jz2bXD6tQXlVjZ50fmQmDpjp0MKnmX<wbr>lHmdzc6P/45W29XvMcs+ZH+<wbr>sAj8Fb0XbJ+<br>
h/9liW/f1uoqp9dNoQBHEQKe/<wbr>iPUtZOeubK+XZknq/<wbr>Ot1vvfl2b6ai8wy41uUGtZ<br>
oEeodz++a+<wbr>s3c4PlbIryOO20JpI7ZNLB1I8XfRdw<wbr>S5SoW6LKv1FHV35KHRlxu4I=<br>
=k+2S<br>
<div class="HOEnZb"><div class="h5">-----END PGP SIGNATURE-----<br>
<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>
</div></div></blockquote></div><br></div>