Join two or more development histories together
git merge
Merge feature branch into current
git merge feature
Create merge commit even if fast-forward possible
git merge --no-ff feature