Reviewing Siebel Repository Object Property Conflicts
Environments: Development environment only.
Platforms: Windows, UNIX, IBM z/OS.
You can change how object property conflicts were resolved during the repository merge.
Note: Only critical conflicts are displayed when you are resolving
conflicts following the repository merge.