Conflicts arise when two or more team members modify the
same file or folder. Conflicts can also arise when you suspend a change
set, modify a file it contains, and then resume the change set.
About this task
These conflicts must be resolved while accepting the incoming
change sets.
Rational Team Concert™ source
control detects
potential conflicts and provides tools and methods to resolve conflicts.
To
resolve a conflict:
Procedure
- In the Pending Changes tool window,
navigate to the Unresolved folder of the component
where conflict exists. Conflicting files and folders are marked with
icon.
- Right-click the conflicting file and choose one of the
following ways to resolve the conflict:
- Open in compare editor: Opens the file
in the compare editor tool so that you can find the differences and
resolve it.
- Auto Resolve: Automatically merges
the differences and resolves the conflict. To confirm the auto resolve,
click OK. If the file cannot be automatically
resolved, a dialog box opens. Click OK to manually
resolve the conflict.
- Resolved with Proposed: Resolves the
conflict with proposed incoming changes. To confirm with the proposed
resolve, click OK. To reload the file, click Yes.
- Resolve with Mine: Resolves the conflict
with your repository workspace changes. To confirm with your repository
workspace resolve, click OK.
- Resolve as Merged: Resolves the conflict
after you have merged the files using the compare editor tool. To
confirm with merged resolve, click OK.
After you have resolved the conflicts, the conflict icon
disappears.