git checkout better_branch
git merge --strategy=ours master # keep the content of this branch, but record a merge
git checkout master
git merge better_branch # fast-forward master up to the merge
Um die Historie besser nachvollziehen zu können:
git merge --strategy=ours --no-commit master
git commit # add information to the template merge message
Quelle: Stackoverflow