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:
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?
David
--
You received this message because you are subscribed to the Google
Groups "foreman-dev" group.
To unsubscribe from this group and stop receiving emails from it, send
an email to [email protected]
<mailto:[email protected]>.
For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups
"foreman-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
