Patent ID: 7606838

Claim:
A method of resolving a conflict in synchronization of a local replica, the method comprising: executing a synchronization process that receives synchronization updates from one or more remote replicas, the synchronization process initiating a resolution process associated with a local data object of the local replica if a conflict is detected between the local data object and a synchronization update; and executing the resolution process concurrently with the synchronization process, responsive to initiation of the resolution process by the synchronization process, the resolution process determining a conflict resolution while the synchronization process processes other synchronization updates, wherein the synchronization process further records a snapshot of the conflict and passes the snapshot to the resolution process, if a conflict is detected between the local data object and the synchronization update, wherein the resolution process further determines whether the conflict resolution is stale by comparing the snapshot to conditions existing after the conflict resolution has been determined, and wherein the resolution process further updates the local data object with the conflict resolution, while the synchronization process processes the other synchronization updates.