Merging Changes from a Parent View to a Child View (Rebase)

Rebase compares or merges changes from a parent view to one of its child, or derived, views. You can start a Rebase View Compare/Merge session from either a parent view or a child view.

To perform a Rebase starting from the parent or child view, do the following:

  1. Open the view to use in your session.

    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. Use the tip revision in the child view because the child is the target in a Rebase operation.

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

    The View Compare/Merge Wizard opens.

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

    Note: Both the Source of Merge and Target of Merge options can be enabled if the parent or child view is both the parent and child of another view.

  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).
  6. Click Next.
  7. Select the child or parent view to use as the target view in the View Tree for the comparison and click Next.
  8. Select one or more types of items you want to include in the compare/merge session and click Next.
  9. 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.