How FileCloud Desktop for macOS handles change conflicts

File conflict occurs when FileCloud Desktop for macOS cannot determine which copy of a file is the most recent. It can arise under the following conditions:

• When two users save the same file at approximately the same time. 
  
• When one user is editing a file offline, and the file is modified by another user in FileCloud. When the person who was offline comes back online and FileCloud Desktop tries to upload the edited version to the server, it detects that there is a new version available.

In these cases:

• If the conflict files have been edited by two different users:
  FileCloud Desktop for macOS automatically resolves the conflict by saving the copy of the file on the server with the original filename, and saving the local copy of the file with the name [filename]-[username].[ext]. Both files are saved locally in FileCloud.
  
• If the conflict files have been edited by the same user:
  FileCloud Desktop for macOS automatically resolves the conflict by saving the copy of the file on the server with the original filename, and saving the local copy of the file with the name [filename]-[machine name].[ext]. Both files are saved locally in FileCloud.
  

In the following example, the users Melanie and test-user edit the file sample1.xls at the same time. The following events occur:

• Melanie edits sample1.xls on the FileCloud server. test-user edits  sample1.xls in a local download from FileCloud Desktop for macOS. 
• They save the file at the same time.
• Melanie's edits are saved in sample1.xls.
• test-user's edits are saved in sample1-test-user.xls.
• Both files appear on the server.