When a conflict is detected, the submission will not
complete and will appear as a conflict in the Modified
Items list for you to correct.
When a locked item is purposely unlocked, it is possible for two
versions of the same file to exist in different user sandboxes. When both
are submitted to staging, being routed first through the appropriate
workflow if one is defined, the file to complete submission first updates
the staging store. When the second file completes submission and attempts
to update the staging store, a conflict is detected.
To resolve the conflict, you must revert the conflicted content item, reapply your changes, and resubmit the item.
- In the My Sandbox pane, click
to expand the
Modified Items list. Items in conflict appear highlighted in the list. - In the Modified Items list, click
(Revert) to revert a single conflicted
item. When you revert a single item, there is no prompt to confirm the
action. The item is immediately reverted to its last submitted version
and cleared from the Modified Items list.
Optionally, click Revert all Conflicts to
revert all conflicted items at once.