Patent ID: 8996457
Filing Date: 2015-03-31
Classification: G06F

Abstract:
1. A computer-implemented method in a synchronized file system for determining a preferred modified version of a file from among multiple modified versions of the file, comprising: receiving an indication from a first client to share a user-generated file stored at the file system with a second client, wherein the first client and the second client are located remotely from the file system; synchronizing the user-generated file between the file system and the second client; receiving notification from the first client of a first modified version of the user-generated file; receiving notification from the second client of a second modified version of the user-generated file; determining a preferred version of the user-generated file from among the first and second modified versions of the user-generated file according to change management rules, wherein the change management rules specify which modified version of the user-generated file is the preferred version based on at least one respective attribute of the first and second modified versions, wherein the at least one attribute is selected from a group consisting of quantity of edits, document type, and document, and wherein the other modified version is non-preferred; and supplying the preferred version of the user-generated file, the non-preferred version of the user-generated file, and an indication of the preferred version to an edit-merge tool for merging edits of the two versions to produce an updated version of the user-generated file.