Obsidian Sync - How do I sync conflict files?

What I’m trying to do

I use Obsidian Sync. I have “Create conflict file” turned on.

Problem:

  • Conflict files seem to be excluded from syncing.
  • I want my conflict files to be synced.
  • I want my phone’s conflict files on my laptop.

In more detail. My phone created some sync conflict files, but they seem to not be syncing to the remote vault, I assume this is because they are specifically excluded from syncing in Obsidian Sync’s code. But I want to get these files to my laptop, but I’d much rather resolve these conflicts manually on my laptop.

Ultimately even doing it manually would be okay, maybe renaming each individually on my phone would work, but I’m looking for the nicest way to do this.

Things I have tried

I searched “how to sync conflict files” and variations of that.

I looked for a way to turn this on in settings, I didn’t find any option. I had the idea of renaming the conflict files but I didn’t try it, since there might be a standard way that that could interfere with.

Mine have been syncing. Renaming shouldn’t masks a difference, but it should be safe to try. I don’t see any Sync settings that would make a difference. You could try restarting the app, but it has probably already restarted itself at some point since it’s on a phone. You could try restarting the device just to be safe. You can of course sync them manually outside of Obsidian as you say, but you may want to email [email protected] to see if the official support you’re entitled to can figure out why they’re not syncing.