Merge Files with the Compare and Merge Tool for XML

Once you have a display of the combined XML files in the Merged View pane, you can walk through the changed nodes and decide whether the change should be incorporated in the merged file from either the base file, or the phase file.

Every modified node in the tree has an associated pop-up menu, with choices that enable you to implement the decision whether to incorporate properties from either the base file, or the modified file.

The new nodes have the following pop-up menu choices:

The deleted nodes have the following pop-up menu choices:

The changed nodes have the following pop-up menu choices:

These choices are also available from the Selected menu.

To merge the two XML files, follow these steps:

  1. Select one of the highlighted nodes in the merged tree view.
  2. Select Use modified file for node and unresolved children from the pop-up menu of the node if you want to have the merged file incorporate the changes that were made in the modified XML file. Select Use base file for node and unresolved children from the pop-up menu of the node if you want to have the merged file have the older version of the corresponding node.
  3. Use Edit - Undo to undo all of your actions up to the last time you saved your work.

The menu selection you make on a node is applied to the node, as well as to all its unresolved child nodes.

For example, if you select a new node to be part of the merged file (Use modified file for node and unresolved children), then all its children will also be in the merged file; in addition, if this was the only node with a conflict under its parent, then the parent would be marked as resolved (its red cross-bar will disappear). Similarly, if you use the phase file as the source for change propagation for a deleted node, the node and all its children will not be present in the merged file.  

Whenever the changes of all the child nodes are resolved, the parent node and all its child nodes will have a check mark in front of them.


Compare and Merge Tool for XML


Compare Files with the Compare and Merge Tool for XML

Copyright 1997, 1998 IBM Corporation, All rights reserved