Merging Changes Between Any Two Related Views (Replicate)

A Replicate View Compare/Merge session compares or merges changes between any two views that are in the same project. You can start a Replicate View Compare/Merge session from either the source view or the target view.

To perform a Replicate operation using the current view as the source or target, do the following:

1. Open the view to use in your session.

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

   The View Compare/Merge Wizard opens.

3. Select Replicate as the compare/merge type.
4. Select Source of Merge or Target of Merge under Use Current View (name) For, and click Next.

5. If you selected Source of Merge, choose the source view configuration to use: Current, Labeled, Promotion State, or Configuration As Of (a specific timestamp).

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

6. Select the target or source view in the View Tree for the comparison and click Next.
7. Select one or more types of items you want to include in the compare/merge session and click Next.
8. Check one or more compare/merge options to use by default at the beginning of the compare/merge, and click Finish.

View Compare/Merge begins comparing the views immediately and opens a new StarTeam window in the Merge Perspective where you can resolve any remaining merge conflicts. Items with unresolved 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.

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