他们对这个问题有很多答案，但他们总是不能工作。
我们有两个分支master和master.min。
checked out branch `master.min`
git merge master --strategy-option theirs
如果在master合并冲突中删除了某个文件
所以我添加了代码，找到已删除的文件并删除并提交它们来解决问题。
但现在它再次失败了重命名的文件。
Getting diff ...
For minification Added: 6 , Modified: 3 , Deleted: 2
Total number of files to merge: 38
Diff done!
Merging origin/master into master...
Merging done!
Deleting files from master.min ...
Deleting files done!
Committing delete files ...
Committing delete files done!
Merging master into master.min ...
Error: 'git merge master --strategy-option theirs' exited with error code 1
CONFLICT (rename/delete): go/xl/03/3A.10.T1/Assets/State3/Res2.json deleted in HEAD and renamed in trunk. Version trunk of go/xl/03/3A.10.T1/Assets/State3/Res2.json left in tree.
CONFLICT (rename/delete): go/xl/03/3A.10.T1/Assets/State3/Res1.json deleted in HEAD and renamed in trunk. Version trunk of go/xl/03/3A.10.T1/Assets/State3/Res1.json left in tree.