Conflict History

When automatic conflict resolution is enabled, M-Files automatically resolves conflicts that occur during data synchronization between vaults. Vault users can then use the Conflict History dialog to see and restore discarded object versions. For instructions on how to configure automatic conflict resolution, refer to Configuring Automatic Resolution of Replication Conflicts.

The configuration specifies if you are told when changes you made to an object are discarded in conflict resolution. The options are:

  • You get a notification.
  • A task is assigned to you.
  • There is no indication of discarded changes.

Showing and Restoring Discarded Object Versions

To show the discarded object versions:

  1. In M-Files Desktop, right-click an object and select Conflict History.
    Result:The Conflict History dialog is opened.
    Note: If there are many discarded object versions, it is possible that the oldest ones are not shown.
  1. Press and hold the Ctrl key, and select two document versions.
  2. Right-click a selected version and select Compare Selected Documents.
To restore a discarded object version:
  1. Select a discarded object version.
  2. Click Restore Object Version.
  3. In the confirmation dialog that is opened, click Yes.
    Result:M-Files uses the contents of the object version to create a new version of the object.