Resolving conflicts interactively at the class 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.

When you resolve conflicts, you decide which representation of the features and attributes you want to keep.

Resolving conflicts at the class level means the representation of the data chosen to replace your edit version of the data applies to all conflicting features and attributes in that feature class.For instance, if you choose to use the conflict version of the Fire hydrant feature class to replace your edit version of the Fire hydrant feature class, all conflicting attributes in all features are replaced with the attribute values in the conflict version.

1. In the Conflicts list, right-click the feature class for which you want to resolve conflicts.
2. Click one of the following options—Replace Objects With Pre-Reconcile Version, Replace Objects With Conflict Version, or Replace Objects With Common Ancestor Version—to designate which representation will be used to replace all attributes in conflict in all features in your edit representation.

Tip:

When you click or right-click a feature class in the Conflicts list, the fields and attributes on the right of the dialog box disappear, as does the conflict displays at the bottom of the dialog box.