I've been using the main Obsidian git extension, https://github.com/denolehov/obsidian-git. Took some work to set it up ergnonomically but it works great now. I enabled auto-commit and push on save, and auto-pull when you start the editor. No merge conflicts yet between two machines.

Should note I use Obsidian for a journal, so it's pretty much append-only.