git-merge in the Git documentation
ID: git-merge-in-the-git-documentation
Primary documentation: git-scm.com/docs/git-merge
Locator: Description, fast-forward/true merge and conflicts.
New to topics? Read the docs here!
New to topics? Read the docs here!