Github has introduced merging via rebase. This essentially keeps the
commits in a PR separate but appends them to the end of the branch:
<Rebase and merge pull requests - The GitHub Blog the two
merge strategies merge via rebase and merge via squash now, I am wondering
if we should disable merge commits. Merge commits leave the PR commits add
complexity to our master branch and they create an additional unnecessary
commit.
Here’s a quick illustration of the branches merge commits add to our git
history. At the top you can see the merge commits and their branches while
the bottom 4 commits have been squashed or rebased without any interspersed
commits:
> Github has introduced merging via rebase. This essentially keeps the
> commits in a PR separate but appends them to the end of the branch:
>
> https://github.com/blog/2243-rebase-and-merge-pull-requests
>
> With the two merge strategies merge via rebase and merge via squash
> now, I am wondering if we should disable merge commits. Merge commits
> leave the PR commits add complexity to our master branch and they
> create an additional unnecessary commit.
>
> Here’s a quick illustration of the branches merge commits add to our
> git history. At the top you can see the merge commits and their
> branches while the bottom 4 commits have been squashed or rebased
> without any interspersed commits:
>
> https://i.imgur.com/8lm76Bd.png
>
> We can disable merge commits in Github and I’m wondering if there’s
> any reason not to given that we can merge via rebase now?
+1 from me. Any reason to leave 'squash' enabled either?
Since there were no objections, we went ahead and disabled commit merges
and merges via squash on Katello/katello. We’ll try it out for a while and
let other teams decide whether to do the same for other repos.
David
···
On Tue, Sep 27, 2016 at 5:28 PM, Justin Sherrill wrote:
On 09/27/2016 04:57 PM, David Davis wrote:
Github has introduced merging via rebase. This essentially keeps the
commits in a PR separate but appends them to the end of the branch:
With the two merge strategies merge via rebase and merge via squash now, I
am wondering if we should disable merge commits. Merge commits leave the PR
commits add complexity to our master branch and they create an additional
unnecessary commit.
Here’s a quick illustration of the branches merge commits add to our git
history. At the top you can see the merge commits and their branches while
the bottom 4 commits have been squashed or rebased without any interspersed
commits:
