How do I resolve conflicts on syncthing fork

This warning has been present on my Syncthing-fork Android app for months. My files seems fine, but I worry that something is fundamentally wrong and my files will be eventually corrupted.

I just want this message to go away. But on a non-rooted Android device, how do I even edit that JSON file? And the app provides no way to resolve this (unless I haven’t seen it).

What do you sync with? It might be easier to deal with on the other side, if that happens to be a normal computer.

It’s a computer, but interesting - it sounds like the conflict file itself is synced?

That’s correct, the conflict file itself is synced. Take a look at Understanding Synchronization — Syncthing documentation .

Oddly, my sync-conflict files weren’t in the files themselves, but in certain files within the .obsidian directory, like ./.obsidian/workspace.sync-conflict-20250820-104418-BUSXRVZ.json.

Besides workspace, the app and appearance files also had conflicts.

I’m not sure what it means that these conflict files exist, but my files seem fine so I deleted all of them :cowboy_hat_face:

This topic was automatically closed 30 days after the last reply. New replies are no longer allowed.