Steps to replace master with a different branch.
I need to do this way too often.
git checkout newbranch git merge -s ours master git checkout master git merge newbranch
Steps to replace master with a different branch.
I need to do this way too often.
git checkout newbranch git merge -s ours master git checkout master git merge newbranch