Resolving Merge Conflicts in View Compare/Merge

You can resolve merge conflicts in the Merge Perspective or the Compare Perspective of a View Compare/Merge session. You can also open File Compare/Merge directly from the View Compare/Merge session to resolve differences in text file contents.

When merging views, no Merge or Mark As Resolved actions are possible for non-branching items, which are requirements, tasks, and topics.

Choose VCM Session > Merge Perspective or VCM Session > Compare Perspective to switch to one of these two perspectives.
Double-click an item with an Unresolved, Resolved, or Merge status.
Note: The item status displays in the Merge Action column of the Merge Perspective, or in the Action column of the Compare Perspective.
The Resolve/Merge Properties dialog box opens displaying the item properties.
Select a property with a conflict to resolve. Properties with conflicts display in bold.
Click Use Source, Use Target, or Merge.
Tip: To quickly specify an action, double-click the Source or Target column for the property to use that value in the Merged column.
Optionally, double-click the Merged column on a text file to resolve the text differences manually.

When an unresolved item is resolved, View Compare/Merge updates the status to Resolved and changes the status icon to a check mark.

Tip: You can also resolve conflicts directly in the Property pane of the Merge Perspective. Right-click a property and choose an action from the context menu.

Note: If you need to stop work on the change session before resolving and committing the changes, or you want to finish it later after having someone else review the proposed changes, you can use one of the VCM Session menu items Save, Save to Local, or Export before committing the session. StarTeam creates a Change Package object with a unique name in the target view which contains all the changes proposed for that change session. It is then available in the Change Perspective where it can later be restarted, reviewed, committed, and once committed, have the session Replayed which reuses the change package session to apply the same set of changes to another view.