Feature request - Help with merge

[hilsonp]

For those like me searching a way to manage merge of sync conflict working on a phone, here is a plugin that can help: https://github.com/friebetill/obsidian-file-diff

We could submit a PR to this project to have a command to manage "conflict files" stored under _fit as it does with syncthings... ... or we could have an option in "fit" to deal with conflicts like syncthings does.

In the mean time, hopefuly this plugin helps.