Resolving conflicts

Resolving conflicts between instances ensures your repository changes are accurate.

About this task
The Conflict view is displayed when you are updating a project. Conflicts occur under the following conditions: To resolve a conflict
  1. Double-click the instance in the Conflict view. The Undo Changes display appears.
  2. Select the changes associated to the instance in conflict.
  3. Select Undo Changes.
What to do next
Once all the changes have been resolved, you can update the project and pull in changes from other users that affect the project.
Note: Resolving any conflicts are mandatory prior to submitting a changeset.
Related concepts
Submitting a change set
Recalling a change set
Undoing and deleting changes
Importing a change set
Exporting a change set
Updating a pending changeset status