Patent ID: 8090681

Claim:
A computer-implemented method for automatically resolving at a server changes made by multiple clients, the method comprising: receiving from a first client a first updated instance of a document and a first document content version, wherein a document content version is a separate version indicator from a typical document version and changes only when the document content changes but not when document metadata changes; updating a stored instance of the document with the first updated instance of the document; receiving from a second client a second updated instance of the document and a second document content version that matches the first document content version, wherein the second client has not received from the server an updated instance of the document since the server received the first updated instance of the document; determining that the second updated instance is derived from the first updated instance based on the first and second document content versions; and updating the stored instance of the document with the second updated instance of the document without notifying the second client of a conflict.