Siebel Database Upgrade Guide > Performing the Siebel Incremental Repository Merge > Process of Upgrading the Siebel Development Environment from Siebel CRM Version 8.1.1.x (SIA Repository) >

Marking Conflict Resolution as Complete Using Siebel Tools

This task is a step in Process of Upgrading the Siebel Development Environment from Siebel CRM Version 8.1.1.x (SIA Repository). Use this task to mark conflict resolution as Complete.

To mark conflict resolution as Complete using Siebel Tools

1. After you have resolved all conflicts, execute the following command from the SIEBEL_TOOLS_ROOT\bin directory on the command prompt:

   siebdev.exe /u username /p password /d "ServerDataSrc" /c "SIEBEL_TOOLS_ROOT\bin\lang_code\tools.cfg" /l primary_language /IRM UpgDeltaMerge /iPackmode

2. After Siebel Tools is started, select the Conflict Resolution Completed check box.
3. Click Finish.

   Clicking Finish creates an entry in S_INST_UPG_HIST table, indicating that the merge and conflict resolution steps have been completed. If this step is not executed, then the next phase of upgrading the custom database schema (upgphys) produces an error in the first step.