Reconcile and post edits to a branch version
After a user creates a version to perform their work, all changes are tracked in the default version and the edit version. The edit version is a named version created for a specific isolated editing workflow. The default version changes can include edits made from direct editing of default or edits posted by other versions.
When you finish editing data in a version, you can perform the reconcile and post processes to merge your edits into the default version. The process that retrieves changes from the default version and merges them with your version is called reconcile. Next, you send the changes you made in the edit version to the default version using the post process.
Note:
Branch versioning supports concurrent reconcile and post operations, allowing multiple sessions to simultaneously post to the default version without requiring exclusive locks.
If the same feature is edited in the current version and the default version, this is considered a conflict. When reconciling branch versions, conflicts are resolved in favor of the edit version. You can specify how conflicts are defined during the reconcile (By attribute or by object).
The following sections describe how to perform the reconcile and post processes from the Versioning tab when working with an active Map view. You can also reconcile and post versions using the following:
- Reconcile Versions geoprocessing tool
- Reconcile/Post button
on the Versions tab in the Versions view
Reconcile process
When working in a version, the reconcile process will detect conflicts between the edit version and the default version.
When reconciling branch versions, be aware of the following:
- The target version is always the default version.
- Conflicts are resolved in favor of the edit version.
- A warning is returned if you attempt to reconcile and there are unreviewed conflicts.
To change how conflicts are defined and what prompts you receive during each reconcile operation, see Versioning options.
To reconcile your version with the default version, complete the following steps:
On the Versioning tab, in the Data Source group, ensure the desired web feature layer data source
is chosen from the drop-down menu.Ensure that you are connected to a version other than default.
On the Versioning tab, click the Reconcile button
in the Versioning group.The Reconcile dialog box appears.
Specify how to define conflicts using the following options:
Define conflicts
Description
By attribute (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.
By object (row)
Any changes to the same row or feature in the target and edit versions will be flagged as a conflict.
Click OK.
Note:
The undo and discard operations cannot be used to revert changes made after a reconcile operation is completed.
When defining conflicts by attribute (column), you can additionally add a field conflict filter to exclude fields from conflict detection. To learn more, see Field-level conflict filtering.
If the reconcile process finds conflicts, you can review and manage these in the Conflicts view. To learn more about the Conflicts view, see Manage branch version conflicts.
After reviewing conflicts, complete the merging process by posting your changes to the default version.
Post changes
To post changes to the default version after you reconcile, click the Post button 
in the Versioning group on the Versioning tab.
To post edits to the default version, the current portal user must have access to edit this version. This means the default version must have the access property set to public, or the portal user must be the version administrator. Learn more about version access
Conflicts can also be discovered during the post process. This occurs when data edits are performed on the default version after your reconcile but before you post your edits to the default version. These edits can be from users editing data in the default version, or from edits that have been posted from other versions. If this occurs, an error is returned and you must perform the reconcile operation again before posting.
Be aware of the following additional information about the post process:
Once changes are posted, they cannot be undone, because you are applying changes to the default version.
If there are conflicts that have not been explicitly marked as reviewed, a dialog box appears when you post, warning that unreviewed conflicts will be automatically resolved. Click Yes to automatically resolve conflicts with the options you chose on the Reconcile dialog box and post the changes to the target version.
After posting, you can continue to make edits to the data in your version. To apply these changes to the default version, you must perform the reconcile, conflict resolution, and posting processes again.
If posting marks the end of your workflow, you can optionally delete the version you have been editing.