Patent ID: 7512638

Claim:
A method for handling conflicts in a peer-to-peer synchronization system, said method comprising: identifying a conflict; representing said conflict as a conflict item storable in a data store, the conflict item comprising one of an unqualified name and a qualified name, the qualified name comprising the unqualified name and a schema name; and logging said conflict item in a durable data store for later resolution of said conflict by said peer-to-peer synchronization system, wherein logging said conflict item comprises logging a first conflict item pertaining to a specific change unit into a durable data store, said first conflict item comprising a change awareness, and said logging comprising; searching the durable data store and determining if there is a preexisting conflict item already present for the same specific change unit as the first conflict item; if there is a preexisting conflict item already present in the durable data store for the same specific change unit as the first conflict item, removing the preexisting conflict item if the change awareness is subsumed by the change awareness of the first conflict item; if there is a preexisting conflict item already present in the durable data store for the same specific change unit as the first conflict item, removing the first conflict item if the change awareness is subsumed by the change awareness of the preexisting conflict item; and if there is a preexisting conflict item already present in the durable data store for the same specific change unit as the first conflict item, and if the change awareness of the first conflict item is not subsumed by the change awareness of the preexisting conflict item, and if the change awareness of the preexisting conflict item is not subsumed by the change awareness of the first conflict item, then retaining the preexisting conflict item in the and adding the first conflict item to the durable data store.