The Resolution Setup tab contains two panes:
Note: When the All parent node is checked, all listed tables have the same conflict resolution types. You may assign an individual table to have a different resolution type from the All setting by clicking the check box next to the table name and then selecting the desired resolution type(s) in the right pane.
The types of conflict resolutions that may be configured are described below:
The following table summarizes the result of conflict resolution depending on the resolution type. The type of approval enabled for a table may further affect the final resolution (for example, if the type of approval for a table is set to Any Conflict, then regardless of the operation to be performed or the type of conflict resolution, the conflict must be resolved manually).
Operation to be Performed | Resolution Type | Resolution Result |
Insert | Server-priority | Discard INSERT. |
| Client-priority | Change INSERT to UPDATE. |
| Manual | Resolve manually. |
Delete | Server-priority | Discard DELETE. |
| Client-priority | Apply DELETE. |
| Manual | Resolve manually. |
Update | Server-priority | Discard UPDATE. |
| Client-priority | If a record in the check-in table is different than the record in the main database, apply UPDATE. |
| Manual | Resolve manually. |