git checkout better_branch
git merge --strategy=ours --no-commit master
git commit -m "Replacing master branch with better_branch"
git checkout master
git merge better_branch
git push origin master
# overwrite master with contents of feature branch (feature > master)
git checkout feature # source name
git merge -s ours master # target name
git checkout master # target name
git merge feature # source name
git branch -m master old-master
git branch -m seotweaks master
git push -f origin master
git checkout new_branch
git merge -s ours master
git checkout master
git merge new_branch