[Pulp-dev] Disabling merge by commit

David Davis daviddavis at redhat.com
Tue Sep 22 15:16:02 UTC 2020


Here's some more information about PR merges as well:

https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges

David


On Tue, Sep 22, 2020 at 11:11 AM David Davis <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:
>
> https://imgur.com/a/uiIa0Mr
>
> 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.
>
> David
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pulp-dev/attachments/20200922/1ddc2fbc/attachment.htm>


More information about the Pulp-dev mailing list