The Serena® Merge Tool allows you to compare the differences between two (or more) files with a common ancestor or base file, accepting or rejecting the differences between them, and combine the changes into a new file or item revision. These files can be revisions of the same item or different items in Serena® Dimensions® CM, or files in your work area.
NOTE When using the web client on UNIX platforms, the mgdiff tool is invoked. Use the Help option for details of how to use it. UNIX users can also choose to plug in their own differencing tools, such as xxdiff. For further details, read the merge_exec script in your client installation.
The merging process allows you to compare the differences between two (or more) files with a common ancestor or base file, accepting or rejecting the differences between them, and combine the changes into a new file or item revision.
The comparing process allows you compare two files side-by-side to see the additions, deletions, and changes between them. You cannot print or save the comparison file.
NOTE You cannot compare or merge binary files.
The difference between comparing and merging files is:
You do not select a target file when you a performing a compare.
When you perform a compare from within the desktop or web clients you can only select two files, an ancestor and one derivative.
When you merge files, you must resolve all the conflicts before you can complete the merge.