This lesson describes the process of rebasing your development
stream.
To
rebase your development stream:
- In the ClearTeam Navigator view, right-click on the user_name_ccrctut_proj view
and select from the context menu.
- Clear the Use parent stream's recommended baseline check
box and click Add.
- In the Select Baseline dialog, click
the Components drop-down list and select user_name_ccrctut_pvob.
- Select the non-recommended baseline (the baseline that
is not marked with the
icon) and click OK.
- 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.
- Click Yes. The ClearCase 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.
- In the Rebase Stream dialog box, click Run
in background.