I agree, the conflict marker resolution idea isn't very clear. I think i'm going to have to look into some other tooling to see how they od it.

Emacs is my current tool of choice, and i'm way too invested to change at this point.