Search notes:

merge [git]

Unless fast-forward, a (successful) merge results in the creation of a new commit. This commit has as parents the tips of the merged branches.

Merge strategies

Merging more than two branches.

When a merge failed, it must manually be resolved.

Used by git by default.

Used for example with binary files. The user provides the merge mechanisms.