<div dir="ltr">I think the two main things for me are (1) it makes git history more linear and (2) it cuts down on the number of commits. Both of these make git history more readable.<div><br></div><div><div><div dir="ltr" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div dir="ltr"><div dir="ltr"><div>David</div></div></div></div></div></div></div></div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Sep 23, 2020 at 6:48 AM Ina Panova <<a href="mailto:ipanova@redhat.com" target="_blank">ipanova@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr">Hi Quirin,<br clear="all"><div><div><div dir="ltr"><div dir="ltr"><div><div dir="ltr"><br><br>--------<br>Regards,<br><br>Ina Panova<br>Senior Software Engineer| Pulp| Red Hat Inc.<br><br>"Do not go where the path may lead,<br> go instead where there is no path and leave a trail."<br></div></div></div></div></div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Sep 23, 2020 at 10:47 AM Quirin Pamp <<a href="mailto:pamp@atix.de" target="_blank">pamp@atix.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <div dir="ltr"> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> "I'd encourage plugins to consider disabling merge by commit as well."</div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> <br> </div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> In order to evaluate this it would be great, if you could explain why this was decided for pulpcore and pulp_file.</div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> You have posted a lot of general information about the different merge type (the "What?"), but not so much on the "Why?".</div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> <br> </div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> As far as I can tell the main advantage of squish and rebase, is that it leads to a more tidy history in master, at the cost of losing some information on how the sausage was made.</div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> As a result squish and rebase becomes increasingly advantageous with increasing PR volume.</div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> However, I fail to see an advantage for pulp_deb, which does not have a large PR volume.</div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> <br> </div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> Or am I missing some relevant part of the argument?</div></div></blockquote><div><br></div><div>I think your understanding is correct. In my perspective it is important to have a tidy history in master no matter how high/low PR traffic you have.<br></div><div><br></div><div>pulp_container has disabled merge by commit as well.<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> <br> </div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif;font-size:12pt;color:rgb(0,0,0)"> Quirin<br> </div> <div id="gmail-m_8585235122672215599gmail-m_-8214920271150331018gmail-m_-1457093599685416421appendonsend"></div> <hr style="display:inline-block;width:98%"> <div id="gmail-m_8585235122672215599gmail-m_-8214920271150331018gmail-m_-1457093599685416421divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> <a href="mailto:pulp-dev-bounces@redhat.com" target="_blank">pulp-dev-bounces@redhat.com</a> <<a href="mailto:pulp-dev-bounces@redhat.com" target="_blank">pulp-dev-bounces@redhat.com</a>> on behalf of David Davis <<a href="mailto:daviddavis@redhat.com" target="_blank">daviddavis@redhat.com</a>><br> <b>Sent:</b> 22 September 2020 17:16<br> <b>To:</b> Pulp-dev <<a href="mailto:pulp-dev@redhat.com" target="_blank">pulp-dev@redhat.com</a>><br> <b>Subject:</b> Re: [Pulp-dev] Disabling merge by commit</font> <div> </div> </div> <div> <div dir="ltr">Here's some more information about PR merges as well: <div><br> </div> <div><a href="https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges" target="_blank">https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges</a><br clear="all"> <div> <div dir="ltr"> <div dir="ltr"> <div> <div dir="ltr"> <div dir="ltr"> <div dir="ltr"> <div><br> </div> <div>David</div> </div> </div> </div> </div> </div> </div> </div> <br> </div> </div> <br> <div> <div dir="ltr">On Tue, Sep 22, 2020 at 11:11 AM David Davis <<a href="mailto:daviddavis@redhat.com" target="_blank">daviddavis@redhat.com</a>> wrote:<br> </div> <blockquote style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <div dir="ltr">Today at open floor, we decided to disable merging by commit for pulpcore and pulp_file PRs. Instead, developers will rebase or squash PRs to merge them. This adds the changes to HEAD instead of interspersing commits and creating a merge commit. This picture of git history comparing pulpcore to foreman (which doesn't merge by commit) illustrates the differences: <div><br> </div> <div><a href="https://imgur.com/a/uiIa0Mr" target="_blank">https://imgur.com/a/uiIa0Mr</a></div> <div><br> </div> <div>I'd encourage plugins to consider disabling merge by commit as well. To do so, go to the settings page for your github repo and look under the Merge Button section.<br clear="all"> <div> <div dir="ltr"> <div dir="ltr"> <div> <div dir="ltr"> <div dir="ltr"> <div dir="ltr"> <div><br> </div> <div>David</div> </div> </div> </div> </div> </div> </div> </div> </div> </div> </blockquote> </div> </div> </div> _______________________________________________<br> Pulp-dev mailing list<br> <a href="mailto:Pulp-dev@redhat.com" target="_blank">Pulp-dev@redhat.com</a><br> <a href="https://www.redhat.com/mailman/listinfo/pulp-dev" rel="noreferrer" target="_blank">https://www.redhat.com/mailman/listinfo/pulp-dev</a><br> </blockquote></div></div> </blockquote></div>