Patent ID: 9348836
Filing Date: 2016-05-24
CPC Classification: G06F

Claim Text:
1. A method comprising: receiving notification of a first user-modified version of a file at a synchronized file system; receiving notification of a second user-modified version of the file at the synchronized file system; determining, by a software module of the synchronized file system, a preferred version of the file from among the first and second user-modified versions of the file according to change management rules, wherein the change management rules specify which user-modified version of the file is the preferred version based on at least one respective attribute of the first and second modified versions, wherein the at least one respective attribute is selected from a group consisting of type of client device that generated the versions, geocoded information associated with the versions, quantity of edits in the versions, and file type of the versions, and wherein the other modified version is non-preferred; and supplying the preferred version of the file, the non-preferred version of the 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.