The merge process consists of:
Selecting an ancestor file as the reference against which the derivatives will be compared.
Selecting one or more derivatives.
Selecting the file or item revision to be the target.
Selecting the differences which have no conflicts and inserting them into the target. If you have selected the Auto Merge option, all the differences except for conflicts will be automatically included in the target.
Resolving conflicts between the base and derivative files by choosing which version of each conflicting change to include in the target.
Saving the changes made to the target file.
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