Resolve synchronization conflict

Resolving a conflict requires the ID and the resolution for the conflict.

The resolution consists of the ID of the element whose changes you want to transfer.

It is not currently possible to transfer a combination of changes from both elements. This must be done manually and the synchronization job run again.

Query synchronization conflicts

To find out whether there are conflicts and, if so, which items are causing conflicts, the conflicts can be queried via the following endpoint:

GET  /odata/syncconflicts?repository=repo1
Header: Authorization: <bearer_token>

This returns the sync conflicts that have occurred.

Information

The "firstSystem" and "secondSystem" properties can be used to determine which system the items belong to. The "firstId" and the "secondId" are the IDs of the conflict items.

Conflict resolution

Once it has been determined which item belongs to which system, the conflicts can be resolved. The corresponding itemId (firstId or secondId of the conflict) must be specified as the "Resolution".

The example below shows the resolution of two conflicts, one with the ELO version and the other with the SharePoint Online version.

The IDs must match the IDs of the synchronization item, which can be identified from the conflict in question as described above.

POST  /odata/syncconflicts/resolve?repository=repo1
Content-Type: application/json
Header: Authorization: <bearer_token>
[
    {
        "SyncConflictId": 1,
        "Resolution": "<elo-itemId>"
    },
    {
        "SyncConflictId": 4,
        "Resolution": "<sp-itemId>"
    }
]