您可以使用递归的“他们的”策略选项：

git merge --strategy-option theirs

来自男子：

ours
    This option forces conflicting hunks to be auto-resolved cleanly by 
    favoring our version. Changes from the other tree that do not 
    conflict with our side are reflected to the merge result.

    This should not be confused with the ours merge strategy, which does 
    not even look at what the other tree contains at all. It discards 
    everything the other tree did, declaring our history contains all that
    happened in it.

theirs
    This is opposite of ours.

注意：正如手册页所说，“我们”的合并策略选项与“我们”合并策略非常不同。

要解决与特定分支中版本的所有冲突，请执行以下操作：

git diff --name-only --diff-filter=U | xargs git checkout ${branchName}

因此，如果您已经处于合并状态，并且希望保留冲突文件的主版本：

git diff --name-only --diff-filter=U | xargs git checkout master

您可以使用递归的“他们的”策略选项：

git merge --strategy-option theirs

来自男子：

ours
    This option forces conflicting hunks to be auto-resolved cleanly by 
    favoring our version. Changes from the other tree that do not 
    conflict with our side are reflected to the merge result.

    This should not be confused with the ours merge strategy, which does 
    not even look at what the other tree contains at all. It discards 
    everything the other tree did, declaring our history contains all that
    happened in it.

theirs
    This is opposite of ours.

注意：正如手册页所说，“我们”的合并策略选项与“我们”合并策略非常不同。

如果您已经处于冲突状态，并且不想逐个签出路径。你可以试试

git merge --abort
git pull -X theirs

git pull-X他们的答案可能会创建一个难看的合并提交，或者发出

错误：您对以下文件的本地更改将被合并覆盖：

如果您想简单地忽略对repo中文件的任何本地修改，例如，在始终应为源镜像的客户端上，请运行以下命令（用所需的分支替换master）：

git fetch && git reset --hard origin/master

它是如何工作的？git fetch执行git pull，但不合并。然后gitreset-hard使您的工作树与上一次提交相匹配。您对回购中文件的所有本地更改都将被丢弃，但新的本地文件将被保留。

VS代码（集成Git）IDE用户：

如果要接受冲突文件中的所有传入更改，请执行以下步骤。

1. Go to command palette - Ctrl + Shift + P
2. Select the option - Merge Conflict: Accept All Incoming

类似地，您可以使用其他选项，如“全部接受”、“全部接受当前”等。，