<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body 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 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="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> pulp-dev-bounces@redhat.com <pulp-dev-bounces@redhat.com> on behalf of David Davis <daviddavis@redhat.com><br>
<b>Sent:</b> 22 September 2020 17:16<br>
<b>To:</b> Pulp-dev <pulp-dev@redhat.com><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">https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges</a><br clear="all">
<div>
<div dir="ltr" class="x_gmail_signature">
<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 class="x_gmail_quote">
<div dir="ltr" class="x_gmail_attr">On Tue, Sep 22, 2020 at 11:11 AM David Davis <<a href="mailto:daviddavis@redhat.com">daviddavis@redhat.com</a>> wrote:<br>
</div>
<blockquote class="x_gmail_quote" 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>
</body>
</html>