In this case, the changes conflict, and you are prompted with a conflict resolution dialog box so that you can choose which changes to keep.

• 在这种情况下,更改会出现冲突,并且系统会通过一个冲突解决对话框来提示您,以便您可以在其中选择保留哪些更改。