How do I resolve conflicts on mobile?

Operating system

Android

Joplin version

3.7.8

Desktop version info

Joplin 3.7.21 (prod, linux)

Appareil : linux, Intel(R) Core(TM) i5-7Y57 CPU @ 1.20GHz
ID client : 95c035210ae047c08e323f07176b0548
Version de Synchro : 3
Version du profil : 54
Trousseau supporté : Non
ID d'instance alternatif : alt1
Cible de synchronisation : Nextcloud
Éditeur : Rich Text

Backup: 1.5.1
Conflict Resolution: 1.2.3
Freehand Drawing: 4.3.0

Sync target

Nextcloud

What issue do you have?

Hi

I must say, I have always been confused about the expected workflow on resolving conflicts on Joplin Mobile. On desktop, there's the Conflict resolution plugin so that's easy.

But on mobile, that plugin isn't available. There's another one "Diff view" but it's unclear what the workflow is. Once I've fixed the differences, what do I do? The note stays in "Conflicts" notebook.

In Joplin 3.8 when it is released, it will sync conflicts across devices, so you can resolve the ones on your phone on your computer. Also it will hopefully include a built in conflict resolution UI on desktop in the next version, so you wont need to use a plugin.

That's a really good news! I'll wait for that next release!