Skip to content

Instantly share code, notes, and snippets.

@zhenyi2697

zhenyi2697/replace_master_branch.sh

Created June 2, 2016 15:55
Show Gist options
  • Save zhenyi2697/dfb497b8ab308d4866875c6b04859425 to your computer and use it in GitHub Desktop.
Save zhenyi2697/dfb497b8ab308d4866875c6b04859425 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
replace_master_branch.sh
Sometimes, master branch contains obsolete codes, and another branch is more "stable" and will be released to production.
If you merge this branch into master, you will find a lot of conflits for unknonw reason. And now, you want to make the other branch as your master.
You can:
git checkout more_stable_branch
git merge -s ours master
git checkout master
git merge more_stable_branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment