Scenario for a Harmless Merge Conflict

This topic gives one example of how a harmless merge conflict occurs. You might experience this merge conflict differently, depending on your business requirements. To keep the examples simple, the value of the ASGN_DT field that this scenario describes is a date only, although the field actually includes date and time. The following sequence of events is an example that produces a harmless merge conflict:

  1. The Siebel Server runs Assignment Manager and modifies the value of several fields in record X, including setting the value of the ASGN_DT field to 2018-10-29. Siebel Remote modifies values in one or more visible fields and logs a transaction.

  2. A remote client synchronizes and receives the updated values for all fields in record X, including the value of 2018-10-29 for the ASGN_DT field.

  3. The Siebel Server runs Assignment Manager and modifies the value of the ASGN_DT field to 2018-10-30 but it does not modify values in any visible fields. Siebel Remote does not log a transaction and it does not send the modified value of the ASGN_DT field to the remote client.

  4. The Siebel Server runs Assignment Manager and modifies the value of several fields in record X, including setting the value of the ASGN_DT field to 2018-10-31. Siebel Remote modifies values in one or more visible fields and logs a transaction.

  5. The remote client synchronizes and receives the updated values for all fields in record X, including a value of 2018-10-31 for the ASGN_DT field. This situation causes a conflict because the transaction updates the value of the ASGN_DT field from 2018-10-30 to 2018-10-31, but the current value of ASGN_DT in the local database is 2018-10-29. The old value in the transaction does not match the current value in the local database, so Siebel Remote reports a conflict.