TRACKING CO-AUTHORING CONFLICTS USING DOCUMENT COMMENTS

摘要

A comment infrastructure for managing co-authoring conflict resolutions is provided. During co-authoring, multiple users may make edits to a document at the same time or users may merge edits to a document. Embodiments determine if changes submitted by a user conflict with previously submitted changes. If a conflict is found, the conflicting change may be saved to the document as a comment, allowing for the user to choose when to resolve the conflict. The original content and the different co-authoring edits may be displayed side-by-side, allowing users to make an informed decision about a desired resolution of a conflict. Additional commenting functionalities may be provided for allowing users to leave comments, replies, or messages associated with a co-authoring conflict, providing communication and collaboration between users about a best way to resolve a co-authoring conflict.