If two people change the same file at the same time, FileCloud Sync app won't try to merge the changes.

  • Instead, Sync will save the original file

  • Sync also saves a second version which has the same name but is appended with the information about the conflict

    Conflict files are named as follows, where filename is the name of the file with the conflict, and the date is the date and time of the conflict:

    • For a file in a shared folder, where other is the name of the other user who modified the file:  filername(Conflict_other (Web browser)_2020-03-25-22-50-36).txt
    • For a file in a team folder, where teamname is the team folder account name:   filename(Conflict_teamname (Web browser)_2020-03-25-23-01-42).txt
    • For a read-only file in a local sync folder,:  filename(Conflict_Read-Only_2020-04-27-21-35-33).doc


You will see a conflict file in your browser's file listingYou will also see a notification in the System Tray

By creating a second file, FileCloud Sync ensures that all changes are preserved and one person's changes will not overwrite another person's work.

Conflict can arise under the following conditions:

  • When two persons save the same file at approximately the same time. In this case the first person's changes are saved to the server and when the second person's sync app tries to save the file, it realizes there is a new version and will prevent the second person's changes from uploading and overwriting the first person's changes. In this case the first person's file is downloaded instead and saved locally adjacent to the original file with the "Conflict_" appended to it.

  • While one person was editing a file offline, the file was modified by another user. When the person who was offline comes back online and the sync app tries to upload the edited version to the server, it will detect that there is a new version available and instead of overwriting the changes on the server, it will download the server file locally and mark it as a "Conflict" file.


To view all the conflicting files:

  1. In the System Tray, right-click on the FileCloud Sync icon, and then select Settings.

2.  At the top of the Settings window, select Activity.

3.  In Filter,  select Errors.

 

4. In the list of recent errors, find the file conflict that you want to resolve.

 

5. Double click the entry to open up a dialog that will help resolve the conflict.

You can resolve the conflict by deleting the file that you don't want any more.

For example, if you want to use the file in the server and discard local changes, then:

  1. Select Resolve Conflict using Remote Server Copy.
  2. Click the Resolve button.