Finding and resolving conflicts
Conflicts can occur whenever a component is being modified in multiple workspaces. Rational Team Concert source control provides tools for finding and resolving these conflicts.
About this task
When Rational Team Concert source control detects that the same file exists in an outgoing change set and an incoming change set, it recognizes that a potential conflict exists and places orange icon overlays beside the Outgoing and Incoming folders that include the conflict. A conflict is classified as a potential conflict until you accept the change set that contains it. You cannot deliver a change set that includes a potential conflict. If you accept a change set that includes a potential conflict, the potential conflict is realized, and must be resolved in your workspace.
Procedure
What to do next
If you chose to Accept in step 3, you must resolve the conflict. As soon as you accept a conflicting change set, the conflicting files in it are moved to the Unresolved folder for the component and you are prompted to resolve the conflicts. Your options for resolving a conflict depend on the type of the conflict and the extent of the differences.