译文来源于百度翻译
conflicts have been resolved in the file 冲突已在文件中得到解决
resolve the conflict by using my version of the file 通过使用我的文件版本来解决冲突
resolve conflicts in local file with my changes 用我的更改解决本地文件中的冲突
resolve the conflict by using the incoming version of the file 通过使用文件的传入版本来解决冲突
resolve conflicts in local file with changes from incoming file 解决本地文件中的冲突与传入文件的变化
resolve the conflict by using the base version of the file 使用文件的基本版本解决冲突