Search notes:

git merge

Join two or more development histories together.
git merge is one of the two main ways to integrate changes from one branch into another, the other is git rebase

Create new commit object

A merge creates a commit object with two ancestors:
Before merge 
A-----C----E    [V1.1]
 \
  B-----D-----F [fix]
Merging the fixes into branch V1.1: 
git checkout V1.1
git merge fixes
Tree now looks like 
A-----C----E----G [V1.1]
 \             /
  B-----D-----F   [fix]

See also

merge
git commands

Index