Using Process Items to Merge Related Files

View Compare/Merge allows you to compare and merge one or more sets of files related to specific process items by selecting the process items to which they are linked and pinned (instead of selecting the files themselves).

To use process items in a View Compare/Merge to select sets of files, do the following:

  1. Choose Project > Open on the StarTeam client menu, and open the source view containing the process items you want to use.
  2. Choose View > Select Configuration and specify the source view configuration you want to use by selecting the appropriate configuration type: Current, Labeled, Promotion State, or Configuration As Of.

    Note: The View Compare/Merge Wizard uses the configuration to which the view is currently set if you start the wizard from the source view.

  3. Select the process items from the Change Request, Requirement, or Task tabs in the source view.

    Note: Use Shift+Click or Ctrl+Click to select multiple items in the upper pane. The items you select stay selected when you switch tabs or project windows.

  4. Right click the item(s) and select Advanced > View Compare/Merge.

    The View Compare/Merge Wizard opens.

  5. Select the type of compare or merge to perform: Compare only, Promote, Rebase, or Replicate.
  6. Select Source Of Merge under Use Current View [name] For, and click Next.
  7. Check Changes associated with [item] on the Include Selected Items page of the wizard.

  8. Check Selected [item] to compare and merge the selected items as well as the files linked to them.

    Caution: The link to each file must be pinned at both ends or it is not included.

  9. Click Next and complete the wizard.

View Compare/Merge begins comparing the views immediately and opens a VCM session window in the Merge Perspective where you can resolve differences in the process items, and/or the files linked and pinned to them. Items with unresolved content or property differences are easy to find. In the Merge Status column for each of these items, View Compare/Merge displays a question mark, followed by the word Unresolved. The component tabs and folders also display a question mark if they contain items with unresolved differences.

If View Compare/Merge can propose an appropriate merge action, it displays the item's status as Resolved with a green check mark. You can change any proposed action with another possible action.

You must resolve each merge conflict before you can complete the merge and commit the changes.