* Solve the conflict according the Timestamp information: the newest change wins agains the older one.
* Manual solve: mark the object and let the user solve the “problem”
=== Conflict solving scenario: Timestamp ===
As a MetaProxyProperty is defined to import/export it's value bidirectional, the Timestamp information is used for determine whether a value may be overwritten by an import or must be exported by an export.
{{Attention|The Timstamp - conflict scenario only works properly as the [[Activate_Logging_of_PropertyValues|Value Change log is activated]] for the target property !}}
'''Import''':
* A value is updated during an import when the Import Timestamp (on the proxy) is greater (newer) than the Update timestamp of the target property.
* The Import Timestamp is set as new Update Timestamp of the bidirectional target property.
{{Hint|You can find a ChangeLog entry even for properties of "new" created UBIK instances as they are configured as bidirectional and were created during an import process!}}
'''Export''':
* The Update Timestamp of the ubik property which is exported will be used as Export Timestamp on the Proxy instance.
==See also==