test

Using Sun WorkShop

Resolving Differences

To resolve a difference, accept the change in either the left or right pane:

  1. To accept a difference, click the Accept button.

  1. To accept the difference and move to the next difference, click the Accept & Next button.

    Note -

    When Merging is invoked by a Resolve transaction in the Configuring window of Sun WorkShop TeamWare, the Reload button is added to the Merging window. Clicking the Reload button at any point during resolution reloads the files, abandons all the conflicts that have been resolved, and starts over. The files are reloaded from disk, and any nonconflicting differences are resolved if the Auto Merge option is selected. You can then proceed by accepting one or the other version of the remaining lines that conflict.