丢弃所有磁头更改并在合并冲突时应用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 .

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