Repository Merge

The main repository merge compares workflows in the Prior Customer Repository, Prior Siebel Repository, and the New Siebel Repository:

Customer-Modified seeded workflows. The repository merge copies the modifications to version 0 of the workflow to the Prior Customer Repository to the same workflow in the New Customer Repository. The merge also copies versions 1 through n of the workflow to the New Customer Repository.
An exception is when a workflow’s object attributes are different in all three compared repositories. This means the object is both customer-modified and has also changed in the new release. This causes a merge conflict.
The repository merge handles workflow attribute conflicts in the same manner as other objects. The merge process typically resolves merge conflicts in favor of the New Siebel Repository. You can review workflow-related attribute conflicts in the Application Upgrade Attribute List screen in Siebel Tools.
If you modify a seeded workflow by deleting any of its child objects, then the merge process does not delete the child objects in the New Customer Repository. After the merge, you must review child objects and delete them as desired.
Unmodified seeded workflows. If the workflow exists in both the Prior Customer Repository and New Siebel Repository, and the highest version level is 0 in the Prior Customer Repository, then the workflow is unmodified.
After the merge, the seeded workflow in the New Customer Repository will be the one that shipped with the new release.
Customer-Created workflows. If the workflow exists in the Prior Customer Repository but not the Prior Siebel Repository, then the workflow is customer-created. The repository merge copies all versions of customer-created workflows to the New Customer Repository.
Customer-Deleted Workflows. If the workflow exists in the Prior Siebel Repository but not the Prior Customer Repository, then the workflow is customer-deleted. The repository merge does not delete the workflow from the New Customer Repository. After the merge, you must review these workflows and delete them as desired.
Obsolete seeded workflows. If the workflow exists in the Prior Siebel Repository but not the New Siebel Repository, then the workflow is obsolete. The repository merge does not copy obsolete seeded workflows from the Prior Customer Repository to the New Customer Repository unless they are customer-modified. After the merge, you must review customer-modified, obsolete workflows and delete them as desired.