Manage conflict
When an object is in conflict, it is displayed with a red conflict icon in the Conflict folder.
To manage objects in conflict, you open them in the compare or default editor,
according to your preference. IXIA CCMS locks the document, opens
the document in the editor, and shows the differences between the topics. You can
look at the changes and accept or reject them as appropriate.
Note: You can merge two tables if the content of the table has changed but the structure
has not changed (no row added/deleted, no column added/deleted). If the structure
changed, the editor will display the table in the source version as deleted and the
table in the target version as added content.
Some tips when resolving conflicts:
|
To manage conflicts in the Synchronization Tree: