The Merge Process

The merge process consists of:

If you are performing a file merge in the web client or desktop client, the selection of the ancestor, derivatives and target is made from the dialog within that client, so that when you enter the Serena Merge tool the main window is displayed with those files already selected. You will then choose which differences to carry forward to the target file.

If you are opening the Serena Merge tool from outside a Serena source control application, you will either choose the ancestor, derivatives and target by specifying them in a configuration file, or by completing the Files tab of the Configuration dialog box.

Related Topics

About the Serena Merge Tool

Selecting an Ancestor

About Resolving Conflicts In the Merge Tool