You can sort the columns in the Resolve Conflicts dialog box to make it easier to group by conflict type or by path.

• 可以在“解决冲突”对话框中对这些列进行排序,以便更容易地按冲突类型或路径进行分组。