Catching Up

You can catch up with work that has been done by other team members and released to the stream since you last synchronized.  To catch up workbench resources:

 

1.

In the Navigator view, select the resource (or resources) whose stream you want to catch up with.

2.

Bring up the context menu.  Select the "Team > Synchronize with Stream" menu item.

3.

In the Synchronize view, select the Catch up mode button on the view's toolbar to filter out any modified workbench resources (outgoing changes) you may have.  See Synchronizing.  

In the Text Compare editor, your local workbench data are represented on the left, and the repository stream data are represented on the right. Click the Show ... Changes buttons in the Structure Compare editor as needed to display all differences.

4.

If there are no conflicts (red arrows), then you can safely catch up all the  resources in the workbench without having to worry that you will lose changes you made in the workbench.  Go to Step 6. 

If there are conflicts, go to step 5.

5.

Resolve conflicts.

This process will likely involve a merge.  Use the text compare area to merge  resources with conflicts.  You can copy changes from the repository version of the resource to the workbench version of the resource and save the merged workbench resource.  Once all the conflicts in the Structure Compare have been resolved, you are ready to release. 

6. Select the top-most resource (or resources) in the hierarchy of the Structure Compare pane, bring up the context menu, and select the "Catch up" menu item.  

7.

In the Release Comment Needed dialog, provide a comment for this release (e.g., "Fixed the spelling mistakes").

 Here is an example of the Synchronize view in Catch up mode, with one conflict and one new resource: