Resolving conflicts

To resolve a conflict, click the conflict indicator to open the Resolve Conflict dialog box.

A conflict happens when there are issues merging the left-hand side resources into the site resource repository. Conflicts are in red, and a clickable icon displays in the middle column.

For example, on the left side there is a thread named conn_8, and on right side there is also a thread named conn_8. Thread conn_8 cannot be added to the current site because of a conflict in the name. To add the thread, you must first rename or overwrite it.

Points to remember when resolving conflicts:

  • The Compare pane shows the results of conflict resources. Different resources have different check points.
  • The Merge option ensures that in conflicts no routing information is lost when deploying a BOX. This option is for thread conflicts.When merging resources, except for route information, all configuration items in one thread are overwritten.
  • When resolving process conflicts, the overwrite option label changes to Overwrite Properties.
  • Selecting Ignore skips the resource during deployment.