Sync Conflict File Renaming

[vcs1w2mq]

Hi,

I encountered my first sync conflict today using OneDrive. After referring to the documentation, I managed to resolve it.

However, I observed two things that seem to deviate from the documentation:

1. Instead of (Conflict XYZ) suffix, (1) is appended to the conflicted file name.
2. If the conflicted files have the same file size, Cryptomator just ignores it and does not attempt to rename the file. In the locked vault, I find e.g. 5TyvCyF255sRtfrIv...83ucADQ==.c9r and 5TyvCyF255sRtfrIv...83ucADQ==-MY-PC-NAME.c9r in the same location (OndDrive resolve conflict by appending my PC’s name to it).

Is this the intended behavior? Should the doc be updated?

Thank you.

[infeo]

@vcs1w2mq

Instead of (Conflict XYZ) suffix, (1) is appended to the conflicted file name.

Oy, this is wrong and needs to be corrected. Good finding! I updated the docs.

@vcs1w2mq

If the conflicted files have the same file size, Cryptomator just ignores it and does not attempt to rename the file.

Conflicts are only resolved on the fly, i.e. when accessing the directory containing the conflict. The file size does not matter in conflict resolution of your encrypted files.