When you are ready to make one or more activities available to
the project team, prepare your work areas. Then, deliver your activities.
To prepare your work areas and deliver activities:
- In Front Desk, locate your development and integration work areas
and prepare them:
- If your project manager has created a new recommended baseline, rebase
your development area.
- If your integration view is a snapshot view, update it and resolve
any hijacked files.
- Find, compare, and check in the work to deliver.
- Click Deliver. You are
prompted to choose the activities you want to deliver.
- In the ClearCase® Delivery
window, start the delivery operation. The deliver operation
merges the work in your development stream with the work in the target stream.
Unless you selected the graphical merge option in the Deliver From Stream
Preview window, the operation performs trivial merges automatically. If merge
conflicts arise, the Diff Merge or XML Diff Merge window opens, where you
can resolve the conflicts manually.
- Open your integration view and test the merge results there. To
verify that your delivered work is compatible with the work in the target
stream, build and test the files in your integration view. You
might have to do the following tasks:
- When you are satisfied with your test build results, click Complete in
the Deliver Status window to complete the delivery.
Your modifications are checked in and your stream is notified that
the delivery has been completed.