Skip to content

Merging Files

Using the ChangeMan Diff utility, you can merge the contents of two file versions with a baseline version and create a new merged version. You can merge any files that can be compared using ChangeMan Diff.

Initiating the Merge

You can initiate the Merge function in one of the following ways:

  • Select one or two files/components in the Explorer window, right-click and choose ZDD Network | Merge Files from the popup menu.

  • Select one or two files in the Staging Versions dialog box and click the Merge button

    The Merge Files dialog box displays:

  • If you selected one file/component, its path name will display in the Base File text box.

  • If you selected two files/components, the path names will display in the Revision 1 and Revision 2 text boxes.

  • Output file contains the path name for the resulting merge file.

    Enter the path names for all of the files. You can type in the text boxes or click the browse button to select files from the Explorer directory tree.

    You can reconcile differences between the file versions either automatically or interactively:

  • Select Automatic merge to have changes between the versions applied based on default rules.

  • Deselect Automatic merge to perform an interactive merge and choose which changes are incorporated.

Automatic Merge

Notes

The automatic merge reconciles the differences between two files according to a set of defined rules. A merged file is created automatically when there are no conflicting changes.

  • In the case of inserted lines, ChangeMan Diff accepts all inserted lines from both revised files.

  • In the case of deleted lines, ChangeMan Diff omits all deleted lines from both files.

  • A message is not returned on successful completion - you can check the results in the Output file.

If there are conflicting changes, such as an update to the same line, ChangeMan Diff displays in Merge mode, where you can do an interactive merge and choose the changes to apply (described in the following section).

Interactive Merge

The interactive merge lets you reconcile disparate changes in the two files by choosing added, deleted, or changed lines from the two versions. Once you have reconciled the differences and go to save the merged file, the file name will depend on the following:

  • If you initiated the merge from the Merge Files dialog box, the merged file is the file name you specified in Output file.

  • If you initiated the merge from within ChangeMan Diff (by choosing File | Merge), you specify the merged file name in the Save As dialog box.

    For more information on merging files, see the ChangeMan ZDD Tools Guide.

Back to top