Skip to content

Instantly share code, notes, and snippets.

@geekforbrains

geekforbrains/replace_master_w_branch

Created February 17, 2012 17:12
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 2 You must be signed in to fork a gist
  • Save geekforbrains/1854430 to your computer and use it in GitHub Desktop.
Save geekforbrains/1854430 to your computer and use it in GitHub Desktop.
Download ZIP
Replace master with branch
Raw
replace_master_w_branch
git checkout <branch>
git merge -s ours master
git checkout master
git merge <branch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment