...

• Update-update
  Occurs when the same object was updated at more than one node.
• Update-delete
  Occurs if a row was updated at one node, but the same row was deleted at another node.
• Delete-delete
  Occurs when a row was deleted from more than one node.

...

Conflict Detection

We add a new row in a database sync_parent_object_hashcode table for each object pulled  from its Parent instance. We keep only the most current hash code of each object.

Conflict detection is based on hash codes. Every object has its own Sync hash code which can be generated basing on that object. During pull or push operation a child instance compares hash codes of a local object, parent's object and recently saved parent's object. The hash code of recently saved parent's object is persisted in the database. We have to establish some shortcuts before we explain when the conflict is detected:

...

The conflict is detected when (#lastP != #P) && (#C != #P).

Note! We have added a new row in a database sync_parent_object_hashcode table for each object pulled  from its Parent instance. We keep only the most current hash code of each object.

...

Conflict Resolution

PULL:

...