Sync manager conflict resolution
First Claim
Patent Images
1. A method for performing a sync operation, the method comprising:
- receiving a first file;
receiving a second file;
determining if a conflict exists between the first file and the second file;
if a conflict does not exist, reconciling the first file and the second file; and
if a conflict does exist, creating a conflict object identifying the first file and the second file and specifying at least one method to resolve the conflict.
2 Assignments
0 Petitions
Accused Products
Abstract
A system and method are provided for implementing conflict resolution in a sync manager. In case of a conflict, the sync operation creates and stores a conflict object, and resumes the sync operation without requiring user input. The sync operation can thus be completed without user input and the user may choose to resolve outstanding conflicts, either on-line or off-line, at a convenient time. Furthermore, the invention provides a platform for developing standardized, user-friendly sync operations. In addition, the invention presents a centralized location that allows a user to quickly and easily resolve conflicts originating from many devices.
128 Citations
20 Claims
-
1. A method for performing a sync operation, the method comprising:
-
receiving a first file;
receiving a second file;
determining if a conflict exists between the first file and the second file;
if a conflict does not exist, reconciling the first file and the second file; and
if a conflict does exist, creating a conflict object identifying the first file and the second file and specifying at least one method to resolve the conflict. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8, 9)
-
-
10. A method for performing conflict resolution, the method comprising:
-
receiving a selection from a user indicating that conflict resolution is to begin;
displaying first file information describing a first file;
displaying second file information describing a second file; and
displaying at least one conflict resolution option, each conflict resolution option identifying a possible method of resolving the conflict. - View Dependent Claims (11, 12, 13, 14, 15, 16)
-
-
17. A system for performing a sync operation, comprising:
-
a sync manager configured to compare a first file and a second file, determine whether a conflict exists between the first file and the second file, reconcile the first file and the second file if a conflict does not exist, and create a conflict object if a conflict does exist;
a conflict store configured to hold conflict objects; and
a resolver specifying at least one method to resolve a conflict. - View Dependent Claims (18, 19, 20)
-
Specification