Updating your VersionVault view (rebasing)

This lesson describes the process of rebasing your development stream.

About this task

To rebase your development stream:

Procedure

  1. In the VersionVault Navigator view, right-click on the user_name_ccrctut_proj view and select Rebase > Advanced from the context menu.
  2. Clear the Use parent stream's recommended baseline check box and click Add.
  3. In the Select Baseline dialog, click the Components drop-down list and select user_name_ccrctut_pvob.
  4. Select the non-recommended baseline (the baseline that is not marked with the recommended baseline icon icon) and click OK.
  5. In the Rebase Stream dialog, the non-recommended baseline is listed in the Use selected baselines list. Click OK. The Rebase message box indicates that one of the versions still requires merging and that you must finish the manual merge before you can complete the Rebase.
  6. Click Yes. The VersionVault Compare/Merge view opens with the merge content displayed, and a Compare/Merge message appears indicating that there is one merge point left to be resolved. Click OK.
  7. In the Rebase Stream dialog box, click Run in background.

Results