Git help: Difference between revisions
Jump to navigation
Jump to search
| Line 6: | Line 6: | ||
git merge dev | git merge dev | ||
</source> | </source> | ||
Revision as of 21:49, 19 July 2013
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>