I'm using a couple of desktop clients with Nextcloud and i noticed that my two desktop Joplin clients where not in sync with each other. I opened the dev tools on one of them and when syncing it logs this for 4 different notes:
17:26:28: Synchronizer: Sync: noteConflict: both remote and local have changes: Note: (Local 4278d293c4c44fd2be662d47f01d997b): (Remote 4278d293c4c44fd2be662d47f01d997b.md)
However, the GUI says nothing about synchronisation failing. There also isn't a Conflict notebook.
What's the procedure here for me to get my client state up-to-date with the remote?
That seems odd. Well, if you don't mind some small data loss, I think you can export the latest version of the notes in question and try deleting them on the device that still syncs fine.
It will propagate the change to the sync target and possibly could resolve the conflict. If doesn't work, try disabling note history.
Once the clients start to sync and delete the notes in question, you may restore the exported notes.
Out of curiosity, do you have conflict resolution plugin enabled?
I do mind the data loss, but i'm not afraid of some manual work to get everything back together again.
I don't have the conflict resolution plugin installed, however after looking at it i don't think it will help me right away because the out-of-sync Joplin client doesn't show any signs of a conflict (like creating a "Conflict" notes folder) other than the dev tool logs, which is what confuses me.
So, you want to merge the differences in the clients' notes manually? I guess for 4 notes it's not very big deal, yeah. I guess you can export those notes and merge the files via git. Then delete the conflicting notes and import the combined files from git.