Linux client conflicts

Support
1

Operating system

Linux

Joplin version

3.6.15

Desktop version info

Joplin 3.6.15 (prod, linux)

Device: linux, Intel(R) Xeon(R) CPU E3-1270 v3 @ 3.50GHz
Client ID: ba47bd1108414595b148e1346dc94817
Sync Version: 3
Profile Version: 49
Keychain Supported: No
Alternative instance ID: -
Sync target: S3
Editor: Rich Text

Revision: c615726

Backup: 1.5.1
Conflict Resolution: 1.2.3
Freehand Drawing: 4.3.0

Sync target

S3

Editor

Rich Text Editor

What issue do you have?

I've seen several reports of this happening on Linux, but didn't see any real solutions.

I run a windows client and a Linux client only. They both sync via S3. When I create a note in Windows it syncs fine to Linux, but Linux will also create multiple conflict entries for the note. Looking at the conflicts with the Conflict plugin, there are no differences at all in the note content. The windows client never shows any conflicts. I have the linux client on a 1 hour or manual sync.

I've watched both clients behavior as I create a note on Windows, then sync via Linux, and it appears there's something going on when the Linux client fetches and decrypts the note. Something in that process registers a conflict, sometimes multiple for the same note. I'm not sure how to verify this further. My solution is to not worry about it, but the rising # of notes in the conflict folder is rather annoying.

2

There is currently a limitation that when using E2EE, if a note conflicts for some reason, a conflict will always be created even if the contents are the same. In Joplin 3.8 this will be addressed if the new auto merge conflicts setting is enabled.

If the contents show the same in the conflict resolution plugin, it is safe to delete it, as it would be just some metadata which is different.