Distinguishing Between a Harmless and a Meaningful Merge Conflict

This topic describes how to distinguish between a harmless merge conflict that is caused by modifications to ASGN_DT fields and a potentially meaningful conflict that involves your data.

To distinguish between a harmless and a meaningful merge conflict

  1. Using the remote client, navigate to the User Preferences screen, and then the Remote Status view.

  2. In the Remote Status list, choose the record of a synchronization session that interests you.

  3. In the Session Actions list, choose a record that includes the following value in the Item Name field:

    Apply database changes

  4. In the Session Action Details list, examine the messages in the Item Details field, using values from the following table.

    Description Guideline

    The Item Detail includes the following information:

    • Who updated the record. For example:

      Updated by HKIM

    • A visible data field. For example:

      Field: Product Under Warranty Flag, New Value: Y, Old Value: N

    This detail identifies a potentially meaningful conflict. To determine if Siebel Remote resolves the conflict correctly, you can examine the values that exist on the Siebel Server and the remote client.

    The Item Detail includes the following information:

    • Does not identify who updated the record. For example:

      Updated by?

    • Identifies an Assignment Date field. For example:

      Field: Assignment Date, New Value: 2018-11-04 11:09:18.000000, Old Value: 2018-10-25 10:10:02.000000

    This detail identifies a harmless conflict. You can ignore it.