-
Notifications
You must be signed in to change notification settings - Fork 2
Conflicts
CAUTION: as of v0.9.96, KoDrive will only start automatically on login on Mac OSX. The Linux autostart is TBA. If you are running Linux, please start KoDrive upon login to avoid potential conflicts.
If a file is modified on different devices simultaneously or files with the same name in different directories are synchronized, the file on the device with the larger value of the first 63 bits for their device ID will be marked as the conflicting file. The file will be renamed to <filename>.sync- conflict-<date>-<time>.<ext>
It will be up to the users to resolve conflicts and update files. It is advised to avoid conflicts if possible.
Please note that if users modify conflict files, it is possible to end up with conflicting conflict files.
Those will be named as sync-conflict-...sync-conflict -...-sync-conflict files.
Adapted from Syncthing's FAQ.