System and method for resolving conflicts detected during a synchronization session
1 Assignment
0 Petitions
Accused Products
Abstract
A system and method is described for resolving a conflict detected while synchronizing a first data object in a first store associated with a mobile device and a second data object in a second store associated with a server. Once the conflict is detected, properties of the first data object are compared with corresponding properties of the second data object. If the properties and the corresponding properties that differ are designated as mergeable properties, the properties and the corresponding properties are merged. Merging the properties involves sending a preferred state associated with each of the properties and the corresponding properties to the mobile device and the server for updating the first data object and second data object, respectively, when an initial state for the properties and the corresponding properties is different than the preferred state. The preferred state is based on a likelihood that vital information would be lost if the preferred state did not replace the initial state of the property or the corresponding property. The merging is performed without user-intervention on the mobile device. In addition, the entire first data object or second data object is not sent to the mobile device to achieve the merge, thereby minimizing the data transfer to the mobile device.
-
Citations
44 Claims
-
1-24. -24. (canceled)
-
25. A computer-implemented method for resolving a synchronization conflict, comprising:
-
designating a first property as a mergeable property and a second corresponding property as mergeable;
determining whether a detected conflict includes a difference between the first property and the second corresponding property; and
when the detected conflict does not include a difference, indicating that the first property and the second corresponding property are not dirty, wherein synchronization is not performed. - View Dependent Claims (26, 27, 28, 29, 30, 31, 32, 33, 34)
-
-
35. A computer readable medium having computer-executable instructions for resolving a synchronization conflict, the instructions comprising:
-
comparing a first file to a second file to determine whether one of the first file and second file is dirty; and
when the first file and the second file are dirty, performing conflict resolution, wherein conflict resolution includes removing a dirty indication when the first data and the second data file are not different. - View Dependent Claims (36, 37, 38, 39, 40)
-
-
41. A computer-implemented method for resolving a synchronization conflict between devices, comprising:
-
determining whether at least one corresponding property of a first file is dirty;
determining whether at least one corresponding property of a second file is dirty;
when the at least one corresponding property of the first file and the at least one corresponding property of the second file are dirty, performing a conflict resolution, wherein the conflict resolution includes indicating that the at least one corresponding property of the first file and the at least one corresponding property of the second file are not dirty when the at least one corresponding property of the first file and the at least one corresponding property of the second file are not different. - View Dependent Claims (42, 43, 44)
-
Specification