On the project Options dialog box, on the Versioning tab, you can change versioning settings for the ArcGIS Pro application. These versioning settings are stored in your user profile and are honored for all ArcGIS Pro projects.
The Reconcile section contains settings for how conflicts are defined and resolved as well as which prompts are received.
Access versioning options
To access versioning options for the project, complete the following steps:
- There are two ways to access versioning options:
- From an open project, click the Project tab on the ribbon. In the list on the left, click Options.
- From the ArcGIS Pro start page, click Settings
in the lower left corner. In the list on the left, click Options.
- On the Options dialog box, under Application, click the Versioning tab.
- Review the settings available under Reconcile and make changes appropriate to support your versioned editing workflows.
Review the Reconcile options section below for more details about each of the settings available.
- Click OK.
Your settings are saved and the dialog box closes.
Tip:
You can also click the dialog launcher 
on the Versioning tab, in the Versioning group, to access Versioning options.
Reconcile options
The reconcile section provides several options to control how conflicts are defined and resolved. Additionally there are settings to control which prompts are received when performing reconcile operations.
To learn more, see Reconcile and post edits to a branch version and Reconcile and post edits to a traditional version.
Define conflicts
You can define a conflict as a discrepancy between corresponding attribute fields or between object geometry and attributes in a database row.
- By attribute (by column)—Only changes to the same attribute (column) of the same row or feature in the target and edit versions will be flagged as a conflict. This is the default setting.
- By object (by row)—Any changes to the same row or feature in the target and edit versions will be flagged as a conflict.
Resolve conflicts
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.
- 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.
Display reconcile options to define and resolve conflicts
When performing a reconcile, you can set a preference for displaying the prompt to choose how to define and resolve conflicts.
Display reconcile options to define and resolve conflicts:
- Checked (Default)—Each reconcile will provide a prompt to choose how to define and resolve conflicts.
- Unchecked—Reconcile options are not displayed for how to define and resolve conflicts and the project options are used.
Display the Conflict Manager dialog box to review conflicts
When conflicts are detected during reconcile, they are initially resolved in favor of the edit or target version. An additional dialog box is presented to give an option to display the Conflict Manager dialog box to review the conflicts interactively. You can decide to show or hide this prompt.
Display the Conflict Manager dialog box to review conflicts:
- Checked (Default)—When conflicts are present during the reconcile, provide a dialog box to show the Conflicts view.
- Unchecked—When conflicts are present during the reconcile, do not provide a dialog box to review conflicts.