Git:替换master分支

git checkout new-design
git merge --strategy=ours --allow-unrelated-histories master
git checkout master
git merge new-design
git push origin master