METHOD TO MODEL SERVER-CLIENT SYNC CONFLICTS USING VERSION TREES

摘要

A file server and a method of operating a file server where version identifiers for documents on the server are maintained as a branched tree. When a client computer attempts to sync up a new version of a file, it must upload the version identifier that it received when it synced down the file. The file server compares this version identifier to the numbers in its version tree for the file and may place the document in the correct place in the tree structure, which may not be as the “latest version” of the document. If the client is using an outdated version of the document, the server may also sync down the latest version of the file. The user may view the changes to the version tree and reconcile different versions to create an authoritative version, and this review and reconciliation may occur at any time, instead of being performed at the moment that the file is saved or forking the file into a new filename.