Editing Git help
Jump to navigation
Jump to search
The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then publish the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 1: | Line 1: | ||
== | == Merging Branches == | ||
http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging | 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 80: | Line 13: | ||
=== | === 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. | ||
Line 86: | Line 19: | ||
git checkout dev | git checkout dev | ||
git merge master | git merge master | ||
</source> | </source> | ||
[[Category:How-to]] | [[Category:How-to]] | ||
[[Category:Linux]] | [[Category:Linux]] |