Resolving conflicts interactively at the row level

Available with Standard or Advanced license.

If conflicts arise between your edited version and the target version when you reconcile, you can resolve these conflicts interactively on the Conflicts dialog box. The Conflicts dialog box appears only if you set your editing options to automatically save changes only if there are no conflicts.

Resolving conflicts at the row level means the chosen representation applies to all conflicts in that feature.So if the Color field and the Shape field in fire hydrant 1297 both have conflicts, the representation you choose to replace your edit version will replace the attribute values for the Color field and the Shape field.

1. In the Conflicts list, right-click the Object ID of the feature for which there are one or more conflicts.
2. In the context menu, click the option—Replace Object With Pre-Reconcile Version, Replace Object With Conflict Version, or Replace Object With Common Ancestor Version—to designate which representations will be used to replace the attributes in conflict in that feature in your edit representation.