Overview
When you merge documents in Version Story, the system will detect if changes proposed by two drafts are directly adjacent to one another. Version Story flags this as a Merge Conflict.
A Merge Conflict card will appear in the panel on the right-hand side of the document viewer. It displays the conflicting proposed changes, accompanied by context on the authors and versions.
Example
The example below shows a merge of Version A, by Kim and Version B, by Jim:
Kim and Jim both made their revisions to the Template NDA.
The Template NDA says that confidentiality obligations will not apply to information that "was rightfully communicated to the Recipient free of any obligation of confidence subsequent to the time it was disclosed to the Recipient;"
Kim and Jim both proposed modifications to this same sentence.
Kim proposed inserting, "from an individual or entity".
Jim proposed inserting, "by a person".
Kim and Jim each proposed different, conflicting, changes to the same section of the template. Version Story will detect these conflicting changes when merging these versions and flag the conflict for your attention.
Related Articles
Click hear if you need a refresher on how to merge documents.