git - 丢弃所有头部更改并在合并冲突上应用 FETCH_HEAD

Question

我做了一个git pull origin master，大约有 50 个文件有冲突，是否可以在所有有冲突的文件FETCH_HEAD上自动应用部分并丢弃部分HEAD？

<<<<<<< HEAD
    | does not have to be set. If it isn't we'll try our best to guess the URL
=======
    | does not have to be set. If it isn't, we'll try our best to guess the URL
>>>>>>> FETCH_HEAD

Answer 1

是的。利用...

git checkout --theirs .

...对当前目录中或之下的所有文件执行此操作。