两个分支合并，需要覆盖掉当前分支的文件

git checkout --theirs XXX文件

合并的时候需要保存当前分支的文件可以用：

git checkout --ours XXX文件

There’s two unmerged files here.

According to the git checkout manpage,

there’s a --theirs and --ours options on the command.

The former will keep the version of the file that you merged in,

and the other will keep the original one we had.

转载于:https://www.cnblogs.com/qianxinxu/p/7417616.html