System and method for resolving conflicts detected during a synchronization
First Claim
1. A computer-implemented method for resolving a synchronization conflict, comprising:
- designating a first property of a first data file as a mergeable property and designating a second corresponding property of a second data file as mergeable;
determining whether a detected conflict includes a difference between the first property and the second corresponding property, wherein the conflict is detected by the presence of a dirty indicator in the first data file and a dirty indicator in the second data file; and
when the detected conflict does not include a difference, removing the dirty indicator from both the first data file and the second data file, wherein synchronization is not performed on the first property and the second corresponding property.
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.
28 Citations
20 Claims
-
1. A computer-implemented method for resolving a synchronization conflict, comprising:
-
designating a first property of a first data file as a mergeable property and designating a second corresponding property of a second data file as mergeable; determining whether a detected conflict includes a difference between the first property and the second corresponding property, wherein the conflict is detected by the presence of a dirty indicator in the first data file and a dirty indicator in the second data file; and when the detected conflict does not include a difference, removing the dirty indicator from both the first data file and the second data file, wherein synchronization is not performed on the first property and the second corresponding property. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9, 10)
-
-
11. A computer readable storage medium having computer-executable instructions for resolving a synchronization conflict, the instructions comprising:
-
designating a first property of a first data file as a mergeable property and designating a second corresponding property of a second data file as mergeable; determining whether a detected conflict includes a difference between the first property and the second corresponding property, wherein the conflict is detected by the presence of a dirty indicator in the first data file and a dirty indicator in the second data file; and when the detected conflict does not include a difference, removing the dirty indicator from both the first data file and the second data file, wherein synchronization is not performed on the first property and the second corresponding property. - View Dependent Claims (12, 13, 14, 15, 16)
-
-
17. A system, comprising:
-
a processor; and a storage having computer-executable instructions stored thereon, wherein the computer executable instructions are configured to; designating a first property of a first data file as a mergeable property and designating a second corresponding property of a second data file as mergeable; determining whether a detected conflict includes a difference between the first property and the second corresponding property, wherein the conflict is detected by the presence of a dirty indicator in the first data file and a dirty indicator in the second data file; and when the detected conflict does not include a difference, removing the dirty indicator from both the first data file and the second data file, wherein synchronization is not performed on the first property and the second corresponding property. - View Dependent Claims (18, 19, 20)
-
Specification