Once you're finished editing a version, you can merge the changes into any version that is the ancestor, such as the parent or DEFAULT version. To merge the changes, you must reconcile, resolve any conflicts, and post. This topic discusses the first step in this process: reconciling.
Since you started working on your version, the target version may have been changed by other users in a way that conflicts with your edits. Reconcile looks for such conflicts. Conflicts occur when
- The same feature is updated in both the current version being edited and the target version.
- The same feature is updated in one version and deleted in the other.
Conflicts also occur when a topologically related feature or relationship class is modified in the current version being edited and a target version.
When you reconcile, the version you're editing is updated with changes from the target version. You may be able to notice features changing as inserts, updates, and deletes of any feature or record from the target version are applied to your edit session.
If there are conflicts, ArcGIS initially resolves them in favor of either the version you're editing or the target version representation, depending on your preference. Once conflicts are initially resolved, you can review them one at a time, and if necessary, make any changes. For example, if a conflict is resolved in favor of the edit version, you can choose to replace it in favor of the target version or even use the editing tools to modify it in another way.
To reconcile, click the Reconcile button on the Versioning toolbar and specify the following:
- The target version
- How conflicts are defined
You have the following options:
| Define conflicts at this level |
To detect cases where |
|---|
| Row |
A second user edits the same row, feature, or topologically related features as you did. The conflict occurs even if you edited different attributes. This is the default. |
| Column |
A second user edits the same attribute of a feature or table. |
- How you want ArcGIS to initially resolve conflicts—in favor of the version you're editing (referred to as the edit version) or the target version
If you resolve in favor of the target version, all conflicting features in the current edit session are replaced by their representations in the target version. If multiple users are editing the same version and conflicts are detected, the feature that was first saved replaces the edit session's representation.
If you resolve conflicts in favor of the edit version, all conflicting features in the current edit session take precedence over conflicting representations in the target version.
NOTE: You cannot use the Undo operation to undo a reconcile. Any time you try to use the Undo operation, you will get an error message because it is not a supported operation for reconcile. To undo a reconcile, you must exit your edit session without saving changes.
Once conflicts are initially resolved, you can choose to work with the interactive conflict resolution editor to review the conflicts, and if necessary, make any changes.
Reconciling only updates the edit version so that ArcGIS can check for conflicts; it doesn't merge changes into the target version. Once you've finished reconciling and have
reviewed any conflicts, you complete the merge process by
posting your changes to the target version.
