Sun WorkShop TeamWare 2.1 User's Guide

Merging Previously Unmerged Branch Deltas

To show the version history for a file:

  1. Select the file's icon in the main window and choose View > File History.

  2. In the History window, select the two versions that you want to merge.

  3. Click the right mouse button to open a popup menu that contains the Merge Branches command.

  4. Choose Merge Branches from the popup menu.

For more information about TeamWare Versioning, see Chapter 12, Performing Basic SCCS Functions with Versioning."