Resolve Feature Conflicts dialog box
 
 
 

Use this dialog box to specify how to handle changed objects when the object has been changed in both the parent and the child version.

To commit changes back to the data store

In Map Explorer, right-click the feature source and click Manage Versions.

Choose The Parent Version

Keep the object in the parent version and discard changes in the child version.

Choose The Child Version

Overwrite the object in the parent version with the changes from the child version.

Cancel

Stop the Save operation. Determine which version of the objects to keep and modify the child version accordingly.