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)

The pull command can also merge. See Fork Pull


Merge from master to the feature branch

git checkout feature
git merge master

# or in one liner
git merge master feature

Merge from a fork

Powered by ComboStrap