Patent ID: 9116942
Filing Date: 2015-08-25
Classification: G06F

Abstract:
1. A computing device comprising: at least one processor; and a memory connected with the at least one processor, the memory having instructions recorded therein, such that: the processor is configured to determine whether a first copy of a file differs from a second copy of the file; and the first copy of the file and the second copy of the file each including respective content and respective metadata; the processor is configured to determine whether all core metadata fields of the first copy of the file match corresponding core metadata fields of the second copy of the file; if all of the core metadata fields of the first copy of the file are determined to match the corresponding core metadata fields of the second copy of the file: the processor is configured to categorize a nature of differences of one or more metadata fields of the first copy of the file with respect to one or more corresponding metadata fields of the second copy of file as mergeable or subsumable; the processor is configured to resolve a conflict of the one or more metadata fields of the first copy of the file with respect to the one or more corresponding metadata fields of the second copy of the file based on the categorized nature of the differences; wherein the processor is further configured to merge or subsume depending on the categorization of the nature of differences.