Conflicts can happen when a file or directory was modified from different locations.
1. File Conflict
During file synchronization a file conflict occurs when a file has changed in both locations (source and target) since the last sync, making it difficult to determine which version should be left unchanged and which version should be updated.
EXAMPLE: if you've changed a document on your desktop computer since the last synchronization and also made a different change to the same document on your laptop, a file conflict will occur.
2. Folder Conflict
A directory conflict is always a conflict where a directory has been deleted on one end, and changed on the other end. This change can be one of the following (or a combination): new file added, file changed, file properties changed.
HOW WE HANDLE CONFLICTS
When a conflict arises, the Nomadesk software will pop-up a conflict resolution window to help the user to decide upon the most suited resolution:
- rename my version: this will create a copy of the conflict file, with a _NAME behind it.
- keep my version: keeps your own version, overwriting the serverside version of that file.
- keep their version: keeps the serverside version, overwriting the local version of that file.
- temporary ignore: this will ignore the failed path untill the client is restarted.
- retry: this will retry the sync again.
NOTE: there is also the option to resolve conflicts automatically, which will ALWAYS use the local version.