In this case, the changes conflict, and a conflict resolution dialog box appears that allows you to decide whose changes to keep.

• 这种情况下就会产生修订冲突,这时将出现冲突解决对话框以便决定保存哪个人的更改。