Skip to content

Instantly share code, notes, and snippets.

@danrcoull

danrcoull/git-replacemaster.sh

Created November 15, 2016 12:36
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save danrcoull/3d29fe6c33642f1db89b8c895d75dfd6 to your computer and use it in GitHub Desktop.
Save danrcoull/3d29fe6c33642f1db89b8c895d75dfd6 to your computer and use it in GitHub Desktop.
Download ZIP
replace merge with the name of the branch you wish to replace master with.
Raw
git-replacemaster.sh
git checkout merge
git merge -s ours master
git checkout master
git merge merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment