In-editor merge conflict resolution?

Hi. There's no CONTRIBUTING file, so I wanted to create this alongside the PR in case that's required.

Currently, resolving conflicts means hand-editing <<<<<<< / ======= / >>>>>>>, which is a little rough if you don't know Git. I'm imagining an in-editor UI with both per-hunk keep ours/theirs/both and a header bar to apply one choice to the whole file. On top of that the generated conflict list ticks files off as they get resolved, so it's clear when you're done.

I use GitHub Desktop right now just because it's quicker, but I'd rather this plugin be the only place I have to go. Also love the recent UI work, by the way!

https://github.com/Vinzent03/obsidian-git/pull/1175 Happy to change anything as needed