Resolving conflicts in file content

Content conflicts occur when a workspace contains two change sets that include different versions of one or more files.
About this task

To resolve conflicts in file content:

  1. Navigate to the Unresolved folder of the component in which the conflict exists. This folder and the conflicting files it contains are overlaid with the Conflict overlay icon icon. (Nonconflicting files have already been added to your workspace.)
  2. Move your mouse pointer over the name of a conflicting file to see a tool tip that identifies the type of conflict and suggests ways to resolve it.
  3. Right-click the conflicting file and choose a way to resolve the conflict.
    • To try to resolve the conflict by automatically merging the incoming file with the one in your workspace, right-click the file and click Auto Resolve. The Auto Resolve tool works by merging nonconflicting changes such as simple additions or removals (but not intra-line differences). If it cannot do this, it displays a message telling you that you must resolve the conflicts manually.
    • To replace the file in your workspace with the one that contains the conflicting changes, click Resolve with proposed.
    • To replace the file that contains the conflicting changes with the file that is currently in your workspace, click Resolve with mine.
    • To resolve the conflicts in the Eclipse Compare Editor, right-click the conflicted file and click Open in compare editor. In the Compare Editor, you can use the Copy all nonconflicting changes from right to left button to reduce the number of conflicts that you have to review and resolve yourself. For more information about using the Compare Editor, see the Eclipse platform Help.
      Note: Rational Team Concert™ source control extends the Eclipse Compare Editor to include an Auto Resolve button and a Resolve as Merged button that you can click to indicate that you have finished merging. In addition, the MIME type and line delimiter properties for the files are displayed if they are not the same for all versions being merged.
    As an alternative to any of these choices, you can resolve a conflict by discarding the change set in your workspace that conflicts with the one you have accepted. If the conflict is in an outgoing change set, find it in the Outgoing folder and discard it. Otherwise, use the History view to find the change set, right-click it, and click Discard.
Results

You are prompted to confirm your choice. After you do, the merge is completed, and the outgoing change set can be delivered.


Feedback

Did this help? You can provide feedback at Jazz.net (registration required): Comment in the forums or submit a bug