Skip to content

Instantly share code, notes, and snippets.

@zrod

zrod/gist:4251777

Created December 10, 2012 16:54
Show Gist options
  • Save zrod/4251777 to your computer and use it in GitHub Desktop.
Save zrod/4251777 to your computer and use it in GitHub Desktop.
Download ZIP
"Replace" master with another branch
Raw
gistfile1.txt
In the unfortunate case where a branch other than master is often used - or becomes the new "master" - and a replacement of master with it is required, execute the following codes:
git checkout branchie
git merge -s ours master
git checkout master
git merge branchie
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment