If conflicts arise between your edited version and the target version when you reconcile, you can resolve these conflicts interactively in the conflict resolution dialog box. The Conflicts dialog box will appear only if you set your editing options to Automatically save changes only if there are no conflicts.
Learn about setting versioning edit options.
When you resolve conflicts, you are deciding which representation of the features and attributes you want to keep.
Conflicts can be resolved at several different levels:
- Field level (attribute)—You choose which representation to use to replace specific attribute values in your edit version of the data. These changes apply to a particular field or fields.
For example, if the color field for fire hydrant 1297 in a fire hydrant feature class contained the attributesRed for the common ancestor versionYellow for the prereconcile versionOrange for the conflict versionyou would choose which color (which version's attribute value) you wanted to use to replace the attribute value for the color field in your edit version.
Fields are the field names listed under the Property column in the attribute information portion of the Conflicts dialog box.
- Row level (individual feature)—A row in a table represents one feature; for example, the point representing fire hydrant 1297. These are shown in the conflicts list (left side of the Conflicts dialog box) using their OBJECTID.
Resolving conflicts at the row level means the chosen representation will apply to all conflicts in that feature.
So if the color field and the shape field in fire hydrant 1297 both had conflicts, the representation you chose to replace your edit version would replace the attribute values for the color field and the shape field.
- Class level (entire feature class)—Feature classes are in the Conflicts list on the Conflicts dialog box. You will see the name of the feature class in the list.
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 chose 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 would be replaced with the attribute values in the conflict version.
- Root level (all conflicts in all feature classes and features for a particular reconcile operation)—The root level in the Conflicts dialog box is the top level of the Conflicts list.
If you resolve conflicts at the root level, all conflicts detected during the reconciliation process will be resolved using the same representation.
For instance, if you choose to replace with the prereconcile version at the root level, all conflicts in all feature classes and features in the list will be resolved in favor of your edits.
Resolving conflicts does not save your edits to the parent version;
posting your changes to the target version does that.
