1. Using Siebel Tools
  2. Viewing Information About Merge Conflicts and Resolutions

Viewing Information About Merge Conflicts and Resolutions

Note: This task applies only to Siebel Tools.

The following procedure shows how to view information about merge conflicts and resolutions.

To view information about merge conflicts and resolutions (Siebel Tools)

  1. In the Workspace Dashboard, select Merge Reports from the Workspace menu.

    The Merged Workspaces applet opens with the following sections:

    • Merged Workspaces. This section shows the following information for the merge process: Status of merge, Resultant Version, Base Version, From Version, and To Version.

    • Object Differences. This section shows the following information for the merge process: Object Name, Object Type, Top-level parent name and type, and Status of the selected object after the merge process is completed.

    • Attribute Differences - Critical Conflicts. This section shows the attribute information including the Workspace Resolution, Base Version Value, To and From Version values, Conflict, Override, and so on.

  2. (Optional) Select the Override flag to override the default Workspace resolution.

  3. Click Finish to complete the merge process.

    Alternatively, click Cancel to cancel the merge process.