Skip to content

Instantly share code, notes, and snippets.

@odixon

odixon/replace_master_w_branch

Forked from geekforbrains/replace_master_w_branch
Created May 31, 2017 13:49
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 odixon/12cae97c75b940b0b408857528d38be0 to your computer and use it in GitHub Desktop.
Save odixon/12cae97c75b940b0b408857528d38be0 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