3.1.5.6.2 Resolution

  • Article

At a minimum, servers MUST implement conflict resolution to the extent specified in this section. Servers can implement additional resolution algorithms. Any additional resolution algorithms MUST NOT result in the creation of conflict resolve messages, as specified in section 3.1.5.6.2.1.

A version that results from conflict resolution MUST have a PCL that makes it a successor of all conflicting versions. To achieve that, protocol roles SHOULD assign the successor a PCL created by merging the PCLs of all conflicting versions.

Version X is a successor of versions A and B if and only if the conflict detection algorithm specified in section 3.1.5.6.1 would determine that X is not in conflict and is newer than both A and B.

PCLX is a merge of PCLA and PCLB if and only if all of the following statements are true:

PCLX ⊆ (PCLA ∪ PCLB)

PCLX ≥ PCLA

PCLX ≥ PCLB