A conflict can occur when a document revised from a higher configuration or plant level does not match the document in the project level configuration compared to the original design basis.
When conflicts occur between the documents in the project and the plant, those conflicts must be resolved before the documents can be merged into the higher configuration or plant. There are three ways conflicts can be resolved:
-
The project document is merged exactly the same as when claimed from the plant. The plant document is revised to the next major revision.
-
The project document is merged with updates added in the project revision. The plant document is revised to the next major revision.
-
The project document is merged with updates added in the plant revision. The plant document is revised to the next major revision.
As you resolve conflicts using conflict resolution, you decide which details or data and its relationships is correct to the design basis. This may involve further collaboration with technical architects and engineers in your team to determine the correct details to be used for the merge.
To resolve document conflicts:
-
In the Summary pane, click the document displayed with the Item is in Conflict icon.
-
In the Resolve Conflicts section, resolve the conflict by selecting the required document property, file object, or relationship option and choosing the required file object or parameters that are to be merged.
-
Click SAVE & RESOLVE.
-
When a conflict is resolved, the indicator is removed from the document and the counts reflect the change.
-
All the document conflicts must be resolved before the MERGE command is enabled. For more information, see Merge command.
-
Any documents created at the project level can be merged without conflict to the plant level in their latest revision state, as they do not exist at the plant level.