Resolving conflicts between instances ensures your repository
changes are accurate.
The Conflict view is displayed when you are updating a project.
Conflicts occur under the following conditions:
- If you have local changes (changes in the Repository Changes View)
to an instance.
- If the update project operation pulls changes to the same instance
that have been published by another user.
To resolve a conflict
- Double-click the instance in the Conflict view. The Undo
Changes display appears.
- Select the changes associated to the instance in conflict.
- Select Undo Changes.
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.