Delivering Workspaces Using Workspace Toolbar

The following procedure shows how to deliver a Workspace using the Workspace Toolbar.

• When a Workspace is successfully delivered, the following options are disabled on the toolbar: Checkpoint, Revert, Submit, and Rebase.

• If Workspace delivery fails, then the following options are enabled on the toolbar: Rebase and Submit.

To deliver a Workspace using the Workspace Toolbar

1. In the Workspace Dashboard, click Deliver on the Workspace Toolbar.

   You typically select this option to deliver the changes in a Workspace to the MAIN Workspace.

2. In the Deliver Workspace dialog that opens, enter comments in the Enter Comment field and then click OK.

   Entering comments is mandatory when delivering a Workspace using the Deliver option from the Workspace menu/toolbar. The Deliver Workspace dialog also contains the following fields: From Workspace, To Workspace, Merge Status, and a Start Merge button.

3. Click Start Merge to trigger the merge process.

   An In Progress status bar appears and detailed information about the merge process appears in the Merge Status field.

4. Click Done when the merge process completes.

   The status and detailed information about the merge process appears in the Workspace Dashboard.

   If the merge process encounters a non-trivial problem or error, then the following message appears and the Workspace displays a status of Delivery Failed in the View Mode applet: The delivery failed with error: Non-trivial merge found. Rbase needs to be done.

   If you get this message, then you must rebase the Workspace, resolve the conflicts, and then try to deliver the Workspace again. For more information on how to rebase a Workspace, see Rebasing Workspaces.