Versioning options for editing

On the Options dialog box, on the Editing tab, you can define how conflicts for versioned data are defined and reconciled when you save your edits.

To learn more, see Reconcile and post edits to a branch version and Reconcile and post edits to a traditional version.

How do you want conflicts resolved?

You can set version conflicts to be resolved in favor of the edited version or the target version.

Note:

For branch versioning, conflicts will only be resolved in favor of the edited version.

1. On the Edit tab, in the Manage Edits group, click the Options dialog box launcher .
2. On the Options dialog box, click Editing.
3. Expand Versioning and choose one of the following settings:
   • In favor of the edit version—All conflicting features in the current version take precedence over conflicting representations in the target version. This is the default setting.
   • In favor of the target version—All conflicting features in the current version are replaced by their representations in the target version.
4. Click OK.

   Your settings are saved and the dialog box closes.

How you do want to define conflicts?

You can define a conflict as a discrepancy between corresponding attribute fields, or between object geometry and attributes in a database row.

1. On the Edit tab, in the Manage Edits group, click the Options dialog box launcher .
2. On the Options dialog box, click the Editing tab.
3. Expand Versioning and choose one of the following settings:
   • By attribute (by column)—Identifies a conflict only when discrepancies exist between attributes. This is the default setting.
   • By object (by row)—Identifies a conflict when discrepancies exist between object geometry and attributes in the database row.
4. Click OK.

   Your settings are saved and the dialog box closes.

How do you want to review conflicts from multiple users?

When conflicts are detected, you can show the Conflict Manager dialog box and review the conflicts interactively, or hide the dialog box and reconcile them automatically based on your settings.

1. On the Edit tab, in the Manage Edits group, click the Options dialog box launcher .
2. On the Options dialog box, click the Editing tab.
3. Expand Versioning and choose one of the following settings:
   • Show Conflict Manager and let me review conflicts—This is the default setting.
   • Automatically save edits and do not show Conflict Manager—Conflicts are reconciled based on your current settings and saved automatically to the target version.
4. Click OK.

   Your settings are saved and the dialog box closes.