git解决冲突简单方法

如果只是全文件的用本地或远程:

git checkout --ours index.html
git checkout --theirs _layouts/default.html
  • ours:本地
  • theris:远程

如果想全部文件都采用上述策略:

git merge -Xours
git merge -Xtheirs

 

Leave a Reply

Your email address will not be published.