Git - Merge

Merge is designed (as rebase) to integrate changes from one branch into another branch

It join two or more branch together (ie development histories)

git checkout feature
git merge master

# or in one liner
git merge master feature

See Upstream merge