After an object is claimed, conflicts can arise when you attempt to merge the object and the original object has changed in the higher configuration, either directly or through a merge from a parallel configuration, such as a design basis change. It is not possible to merge an object into the higher configuration before the conflicts with the design basis have been resolved.
A Resolve Conflicts dialog box allows you to see all the differences between the two objects and then choose to:
-
Overwrite the values in the higher configuration during the merge, or
-
Update the values in the lower configuration
Once all conflicts are resolved, the claimed object can then be merged into the higher configuration.