Merge branches (fast-forward and three-way)

git merge folds one branch into another. The shape of the merge depends on whether the branches diverged.