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