Notes and anecdotes

Techstuff rambling

git: Replace master branch

So, you have a branch BESTBRANCH and you have basically made it your master branch? (Bad!)
If you want to get back on track, and make BESTBRANCH the master, do this

git checkout BESTBRANCH
git merge -s ours master
git checkout master
git merge BESTBRANCH


tomfa • 2014-02-03

Previous Post

Next Post