Making a Branch the Master in GIT

git checkout cat_killer
git merge -s ours master
git checkout master
git merge cat_killer
git push

cat_killer is the branch you want to make the master.

Stolen from Stackoverflow post.