As I don't use either, can't you just open the file and look for
>>>> and <<<< and resolve them in whatever editor you need ? or do these editors do something else that helps with merge conflicts ?
>>>> and <<<< and resolve them in whatever editor you need ? or do these editors do something else that helps with merge conflicts ?
I find resolving conflicts through this sort of system tends to be a lot more intuitive than trying to mess around with conflict markers - it also helps with protecting against mistakes like forgetting conflicts or wanting to undo changes. If you're not used to it, I really recommend finding a good three-way merge plugin for your editor/IDE of choice.
Emacs is my current tool of choice, and i'm way too invested to change at this point.