Share via

3.1.5.6.3 Reporting

  • Article

Conflict reporting, if deemed necessary by the value of the PidTagResolveMethod property (section 2.2.1.4.1) of the folder, SHOULD be done through a combination of the following methods:

  1. Failing the ROP that detected the conflict.

  2. Creating a conflict resolve message.

  3. Creating a conflict notification message, as specified in section 3.1.5.6.3.1.

Servers MUST implement conflict reporting by failing ROPs and creating conflict resolve messages. Servers MAY implement other means of conflict reporting.

The use of the conflict resolve message combines semi-automatic conflict resolution with conflict reporting: the message has all properties of the winning version, while at the same time it contains all conflicting versions as attachments, which clients can use to offer manual conflict resolution.

Determining whether to perform conflict reporting, and what method of conflict reporting to use, is dependent on the operation that triggered the conflict detection, as specified in section 3.1.5.6.1, and on the value of the PidTagResolveMethod property on the folder, whose values are specified in section 2.2.1.4.1.

This controls whether the RopSynchronizationImportMessageChange ROP (section 2.2.3.2.4.2) is required to perform conflict reporting by failing the ROP or by creating a conflict notification message. However, the RopSynchronizationImportHierarchyChange ROP (section 2.2.3.2.4.2) MUST detect and resolve, and MAY report, possible conflicts by using a conflict notification message.