Git - Merge

> Code - (Programming|Computer) Language > Code Versioning > Git

1 - About

The pull command can also merge. See Fork Pull

Advertising

3 - Management

3.1 - Merge from master to the feature branch

git checkout feature
git merge master
 
# or in one liner
git merge master feature

3.2 - Merge from a fork