Background:

I use Obsidian for journaling and knowledge management. Each page is saved as an individual .txt file rather than in some database which ensures continuity of my data even if I switch applications one day.

I sync the files between my devices using Syncthing. Some of my notes are collaborative with others: by sorting my notes into specific folders and syncing select folders to select devices I have a notes library with a mix of personal and shared notes.

Syncthing is good at managing file conflicts. It surfaces the conflict and lets you select which file should remain. It also has options for very good versioning control.

Answer:

So, to your question, I would love to contribute to Syncthing to provide an optional capability to merge content from two conflicting .txt files rather than selecting one or the other. This would greatly improve the collaborative experience when using Syncthing to manage notes in Obsidian or similar applications.

I think there are a not-insignificant number of people who could get value from this. Syncthing is written in GO, and I've never contributed to an open source project before. I'm looking forward to giving it a shot but if someone else starts first that's just fine with me. :)