When internal conflicts occur during the auto-merge operation, you are presented with the Unresolved Conflicts dialog box explaining that some files must be resolved individually.

• 如果在自动合并操作期间发生内部冲突,会显示“未解决的冲突”对话框,解释某些文件必须单独解决。