In SecuriSync, you may encounter conflicted file / folder copies.

Files

When an unlocked file is being edited by several users at the same time, the user who first saves changes can continue to save subsequent changes to the original file. Updates made by other co-editors will be saved and stored as conflicted files in the same folder in SecuriSync. Updates saved into conflicted files have to be manually merged into the original file.

Conflicted files have the following naming convention:

Filename (Conflicted copy YYYY-MM-DD for Username)

Example:

Our Shared File (Conflicted copy 2015-10-01 for jsmith)

To avoid conflicts, use the Lock functionality. Collaborators won't be able to edit the file.

Note: in MS Word, you can use Merge Documents or Compare Documents options to merge/find the changes.

Folders

Sometimes you may find folders with an index postfix in the folder name, e.g. 'New Folder (2)'. This can happen if you tried to create a new folder or accept a share invitation having Shared or Private folder with the same name under My SecuriSync folder.

  • if the user accepted share having a local folder with the same name – conflict cannot be resolved any other way. The user should keep both his folders.
  • if folder appeared after user tried to delete it, it contains the file that has the extension excluded from synchronization, to resolve the issue delete the folder from web access.
  • if a folder was accidentally created because of a bug, to resolve the issue:
    1. Ensure that client is online
    2. Re-save all recently updated files to the folder without index (Example Folder)
    3. Wait until the folder is synchronized
    4. In Folder Selection, deselect the folder with index to be synced (Example Folder (2))
    5. Delete folder with index locally (Example Folder (2))
    6. Delete folder with index in WebApp (Example Folder (2))


Known issue: If you had a shared folder synced on your desktop and you made some changes in this folder, while you are offline, it is likely a conflicted copy for the whole folder would be created.