[Pulp-dev] Disabling merge by commit
pamp at atix.de
Wed Sep 23 08:32:04 UTC 2020
"I'd encourage plugins to consider disabling merge by commit as well."
In order to evaluate this it would be great, if you could explain why this was decided for pulpcore and pulp_file.
You have posted a lot of general information about the different merge type (the "What?"), but not so much on the "Why?".
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.
As a result squish and rebase becomes increasingly advantageous with increasing PR volume.
However, I fail to see an advantage for pulp_deb, which does not have a large PR volume.
Or am I missing some relevant part of the argument?
From: pulp-dev-bounces at redhat.com <pulp-dev-bounces at redhat.com> on behalf of David Davis <daviddavis at redhat.com>
Sent: 22 September 2020 17:16
To: Pulp-dev <pulp-dev at redhat.com>
Subject: Re: [Pulp-dev] Disabling merge by commit
Here's some more information about PR merges as well:
On Tue, Sep 22, 2020 at 11:11 AM David Davis <daviddavis at redhat.com<mailto:daviddavis at redhat.com>> wrote:
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:
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.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Pulp-dev