To synchronize resources in the workbench with resources in a stream.
1. |
In the Navigator view, select the resource (or resources) that you want to synchronize with a stream. |
2. |
Bring up the context menu. Select the "Team > Synchronize with Stream" menu item. |
3. |
There are 3 modes in which to view resources to be synchronized:
To show only conflicts (resources edited in both the workbench and in the stream) in any one of these 3 modes click on the Show Only Conflicts button on the view's toolbar. In the Synchronize view, you will see the Structure Compare and Text Compare area. In the Text Compare area, the workbench resource is on the left side, and the stream resource is on the right side. The resources displayed in the Structure Compare area will depend on which filters are used in the Synchronize view. Note: It is most often preferable to first catch up, resolve conflicts (usually by merging), and then release workbench changes to the stream. |
Synchronize view: