Options to Resolve a Conflict

A conflict is a situation that occurs if an object that you want to import from an archive does not match the corresponding object in the repository. The objects are examined to determine if they include the same properties, property values, and child objects. If these items are not the same, then this situation represents a conflict.

The following table describes the options available to resolve conflicts that occur when importing an archive file. It describes what happens if it is determined that both the archive file and the repository contain the same top-level object.

Option	Description
Overwrite – the object in the repository.	Selecting this option deletes the object (plus all child objects) in the repository and then copies the object (plus all child objects) from the archive file to the repository.
Merge – the object definitions from the archive with the definition in the repository.	Selecting this option does the following: Replaces the properties that are different in the repository with the properties that the archive contains. If the archive file includes child objects that the repository does not contain, then it copies these objects from the archive to the repository. Does not modify child objects in the repository that are not also in the archive file. When the merge finishes, the top-level objects in the repository include the same properties and child objects that the object in the archive file includes. It also includes any child objects that already exist in the repository. Merge is typically the safest option. Objects are merged by default.
Do Not Import – the object definition from the archive	Selecting this option does not modify the objects in the repository.