git-merge in the Git documentation
= git-merge in the Git documentation
{c}
Primary documentation: https://git-scm.com/docs/git-merge
Locator: Description, fast-forward/true merge and conflicts.
= git-merge in the Git documentation
{c}
Primary documentation: https://git-scm.com/docs/git-merge
Locator: Description, fast-forward/true merge and conflicts.