While resolving complex conflicts manually, I usually want emacs to treat conflict markers and region between them as comment, since it breaks major-mode's syntactic analysis (fontification, electric-indent, etc) :
<<<<<<< HEAD <- comment
aaa
bbb
======= <- comment
ccc <- comment
>>>>>>> brabrabrabra <- comment
It seems possible to visually highlight them as comment with search-based fontification, but is it possible to treat them as comment not just visually but also syntactically ?
<<<<<<<
and>>>>>>>
ascomment-start
strings, but that might have unintended side effects. Have you tried usingediff-mode
? The UI is a bit arcane, but it works pretty well once you get the hang of it, and it handles conflict blocks correctly.