Patent ID: 6993522

Claim:
A computer-implemented method for resolving a conflict detected while synchronizing a first data file in a first store associated with a mobile device and a second data file in a second store associated with a server, comprising: designating at least one property of the first data file as a mergeable property and at least one corresponding property of the second data file as a corresponding mergeable property; determining when the conflict detected comprises a difference between the at least one mergeable property of the first data file and the at least one corresponding mergeable property of the second data file; and when the conflict detected does not comprise a difference between the at least one mergeable property of the first data file and the at least one corresponding mergeable property of the second data file, indicating that the at least one mergeable property of the first data file and that at least one corresponding mergeable property of the second data file are not dirty, wherein synchronization is not performed; and when the conflict detected comprises a difference between the at least one mergeable property of the first data file and the at least one corresponding mergeable property of the second data file, merging the at least one mergeable property of the first data file and the at least one corresponding mergeable property of the second data file to form a single identical data file in each of the first and second stores.