本文转载自:https://blog.csdn.net/everlasting_188/article/details/78192987
方法1:使用-s ours选项合并
git checkout seotweaks
git merge -s ours master 冲突以seotweaks版本为主
git checkout master
git merge seotweaks
方法2:改名master为old-master,然后将seotweaks更改为master,然后push。
git branch -m master old-master
git branch -m seotweaks master
git push -f origin master