Resolving Differences Between Files Using Merging

Related Topics:

Integrating Changes by Putting Back Files Reversing a Bringover or Putback

When two different copies of the same file are changed, the files are in conflict. When you try to perform a putback on a file that you have changed in your child workspace, but it has also been changed in the parent workspace, the Sun WorkShopTM TeamWare tools will prevent you from putting back the file until you have resolved the differences between them.

To resolve differences between files:

1. In the Configuring Window, choose Actions Resolve.

This opens the Resolve Tab of the Transaction dialog box with a list of files in conflict.

2. Select a file.

3. Click Merge Conflicts.
Note - When you do your putback, if you have a checked out file in the child workspace, the Transaction Check-in dialog opens. You have the following choices:
Checkin--Checks the file back into your child workspace
Uncheckout--Returns the file to its pre-checked out state in your child workspace
Skip--Skips to the next checked out file (if any)

The Merging Window opens with the file from the child workspace in the left pane, the file from parent workspace in the right pane, and a default merged file in the bottom pane.

Differences are marked with change bars and colors:

4. The status line on the upper left hand side of the Merging window tells you which conflict in the file you are working with:

or

5. Click Next to go to the next conflict in the file.

If you do not like the changes you have made and you want to start over, click the Reload button. This abandons all the conflicts that have been resolved and reloads the files.

6. Click Save when you have resolved all conflicts.

If you want Sun WorkShop TeamWare to automatically put lines that are not in conflict (that is, the line has changed in one file but not in the other) into the merged file, you can select Options Automerge. Then when you start Merging, Sun WorkShop TeamWare puts all these resolved lines in the merged file for you.