Tracking co-authoring conflicts using document comments

A system for managing co-authoring conflicts, the system comprising:

• a processing unit;
• a data store that is configured to store a document that can be simultaneously accessed by a plurality of users;
• and
• a collaborative review manager operative to:
• provide simultaneous co-authoring access to the document by the plurality of users;
• receive an indication to save a first change made to a content in the document, wherein the first change is made by a first user;
• save the first change to the document while simultaneously receiving edits to the content by a second user;
• receive an indication to save a second change made to the content in the document, wherein the second change is made by the second user;
• identify where the second change is located in the document;
• determine if the second change made to the content in the document and the first change made to the content in the document are located in a content block;
• if the second change made to the content in the document and the first change made to the content in the document are located in the content block, determine the second change is a conflicting change;
• and
• save the conflicting change as a conflict comment associated with the content in the document and allowing the first user and second user to continue editing the document without resolving the conflict.

A computer-readable storage device having computer-executable instructions for managing co-authoring conflicts, comprising:

• providing simultaneous co-authoring access to a document by a plurality of users;
• receiving an indication to save a first change made to a content in the document, wherein the first change is made by a first user;
• saving the first change made to the content in the document while simultaneously receiving edits to the content by a second user;
• receiving an indication to save a second change made to the content in the document, wherein the second change is made by the second user;
• identifying where the second change is located in the document;
• determining if the second change made to the content in the document and the first change made to the content in the document are located in a content block;
• if the second change made to the content in the document and the first change made to the content in the document are located in the content block, determining the second change is a conflicting change;
• saving the conflicting change as a conflict comment associated with the content in the document and allowing the first user and second user to continue editing the document without resolving the conflict;
• providing the conflicting change as the conflict comment in a display of the document, wherein the conflict comment includes original content before a change is received, the first change made to the content in the document, the second change made to the content in the document, and a selectable functionality control for accepting the conflicting change, wherein accepting the conflicting change includes replacing the original content or a previously saved change with the conflicting change;
• and
• providing commenting functionalities for allowing a user to provide a comment, reply, or a message associated with the conflicting change.