Git help: Difference between revisions
Jump to navigation
Jump to search
No edit summary |
No edit summary |
||
| Line 1: | Line 1: | ||
== Merging Dev -> Master == | == 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. | * 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. | ||
| Line 9: | Line 13: | ||
== Mering Master -> Dev == | === 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. | * 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. | ||
Revision as of 21:50, 19 July 2013
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>