How Repository Object Property Conflicts Occur
You cannot resolve conflicts from the report, but you can use the report to identify where to target regression testing and what conflicts have occurred.
The repository merge compares repository object properties in the Prior Siebel Repository, Prior Customer Repository, and New Siebel Repository. When the value of an object property is different in all three repositories, an object property conflict exists. This conflict occurs when you have changed the value of an object property in the Prior Customer Repository, and the value of this property has also changed in the new release (New Siebel Repository).
An object property conflict does not occur if you changed the value of an object property in the Prior Customer Repository, and the object property value did not change in the new release. When a conflict does not happen, the merge process transfers the changed value to the New Customer Repository.
The merge process resolves object property conflicts by referring to the setting of the object’s Standard Win property. For the majority of repository objects, the merge process resolves conflicts by using the object property value in the New Siebel Repository. Do not change the setting of the Standard Win property.