Patent Document ID: 9785693
Application ID: 14319997

Base Claim:
1. A computer-implemented method for detecting conflicting edits to a document stored in a data system, the method comprising the acts of: providing multiple copies of a single version of a document stored in the data system, the document having fields containing content; receiving an edit to the content of a field from the document made in a first copy of the document, the edit made in the first copy stored as a first intent, wherein the storing the first intent comprises: storing a first data type indicating a first action to be performed on the document; and associating a first parameter with the first action; merging the edit made in the first copy with the corresponding field in the document; after receiving the first edit, receiving an edit made in a second copy of the document to the content of the same field modified by the prior edit, the edit made in the second copy stored as a second intent, wherein storing the first intent comprises: storing a second data type indicating a second action to be performed on the document; and associating a second parameter with the second action; determining that the first intent conflicts with the second intent by identifying that the first action opposes the second action.

---

Claim 5:
5. The computer-implemented method of claim 1 further comprising the act of storing each edit merged with the document in a revision history associated with the document.