Git merge

From NovaOrdis Knowledge Base
Revision as of 16:32, 10 September 2019 by Ovidiu (talk | contribs) (→‎Overview)
Jump to navigation Jump to search

Internal

Overview

git checkout <base-branch>
git merge <head-branch>

Options

--no-ff

Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated tag. This is also the default behavior when merging GitHub pull requests with "Create a merge commit" option.