Tracking of collaborative editing of conflicts with the comments of the document

摘要

A comment infrastructure is provided to manage collaborative conflict resolution. During collaborative editing, multiple users can edit a document at the same time or merge edits into a document. Embodiments determine whether a change submitted by a user conflicts with a previously submitted change. If a conflict is found, the conflicting change can be saved as a comment on the document, allowing the user to choose when to resolve the conflict. The original content and the different collaborative edits can be displayed side-by-side, allowing the user to make an informed decision about the desired resolution of the conflict. Can provide additional commenting capabilities, allowing users to leave comments, responses, or messages associated with collaborative conflicts, and communicating between users on how best to resolve collaborative conflicts And provide collaboration.