A conflict occurs when the same feature in a feature service has been edited in both the default version and the job's branch version, resulting in competing values for one or more properties - including attribute fields or geometry.

Conflicts are detected during reconcile and must be resolved before the operation can complete. Resolution is done property by property, with the user or the system choosing which version's value to retain for each conflicting property.

Types of layers for which conflict resolution is supported:

•Regular layers

•Dimension layers

•Annotation layers

 

Table: Types of conflicts when reconciling or completing jobs

When do Conflicts Occur

Conflicts are detected in two scenarios:

For Workers

When a worker synchronizes versions to bring the latest changes from the default version into their job version:

•The same feature was edited in both the default and job versions

•The worker must resolve conflicts before continuing work

For Supervisors

When a supervisor reconciles before closing a job:

•The same feature was edited in both the default and job versions

•The supervisor must resolve conflicts before the job can be posted

Conflict Notification

When you select Reconcile (refresh icon) and a conflict exists, you will receive a notification that conflicts must be resolved before proceeding. For details on how reconcile works across multiple feature services, including error handling and lock management, see Reconcile Job Versions.

When conflicts are detected, a panel opens displaying a tabular view of the conflicting properties:

•Default version: Shows the feature state in the default version

•Branch version: Shows the feature state in the job version

•Field values: Displays all fields and their values in both versions

•Visual representation: The geometry row shows a graphical representation of the feature in both versions, allowing you to visually compare the differences

 

Resolution Mode Configuration: Your organization's administrator configures whether conflict resolution is automatic or manual. This setting applies to all reconcile operations in your system.

Automatic Resolution

If your organization is configured for automatic conflict resolution:

1.You will receive the message: "Resolutions applied successfully"

2.The conflict interface displays the tabular view of conflicts

3.No checkboxes appear for selecting between versions

4.The system automatically determines which version to retain

5.Click Save Resolution to apply the automatic resolution

6.The feature on the map updates to display the applied changes

Manual Resolution

If your organization is configured for manual conflict resolution:

1.The conflict interface displays the tabular view with checkboxes

2.For each conflicting property, you will see two checkboxes:

oDefault: Select to retain the default version's value

oBranch: Select to retain the job version's value

3.Review each conflict carefully

4.Select the checkbox for the version you want to keep
The unchecked version will be discarded
Use the visual geometry representation to help decide which version to retain

5.Click Save Resolution after making all selections

6.You will receive the message: "Resolutions applied successfully"

7.The feature on the map updates to display the applied changes

Manual Resolution Advantage: Manual resolution gives you complete control over which changes to keep for each conflicting property, allowing you to make informed decisions based on your knowledge of the work.

Once the conflict resolution panel appears, the user must resolve all the conflicts in order before closing the panel.

Validation After Resolution

After successfully resolving conflicts, validate your data to ensure integrity.

To validate the resolved data:

1.Navigate to the Network tab.

2.Click Validate Network.

3.Select Extent Only as the validation option.

4.Click Verify.

If validation succeeds, the message "No errors - successfully validated" appears.

Next Steps

After resolving conflicts and validating:

•Workers: Continue working on the job or complete it

•Supervisors: Proceed to close the job