你也可以这样做:

git checkout --theirs /path/to/file

保留远程文件，以及:

git checkout --ours /path/to/file

保存本地文件.

然后 git add 它们就完成了.

Then git add them and everything is done.

版本:请记住，这是针对 merge 场景的.在 rebase 期间，--theirs 指的是你一直工作的分支.

Edition: Keep in mind that this is for a merge scenario. During a rebase --theirs refers to the branch where you've been working.