Git - Merge
Table of Contents
About
Merge is designed (as rebase) to integrate changes from one branch into another branch
It join two or more branch together (ie development histories)
Articles Related
Management
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
See Upstream merge