Git help

From RARForge
Revision as of 21:49, 19 July 2013 by Robertr (talk | contribs) (Created page with "== 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 ...")
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search

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>

Retrieved from "https://rarforge.com/w/index.php?title=Git_help&oldid=794"