Git help
Jump to navigation
Jump to search
Merging Branches
http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging
Merging Dev -> Master
- Will checkout the 'master' branch and merge from the 'dev' branch. Any applicable changes within 'dev' will be in 'master' once this command has completed.
<source> git checkout master git merge dev </source>
Mering Master -> Dev
- Will checkout the 'master' branch and merge from the 'dev' branch. Any applicable changes within 'dev' will be in 'master' once this command has completed.
<source> git checkout dev git merge master </source>