Conflict resolution in Emacs

Enter smerge-mode

Doom-emacs’s default keybindings are a pain though. C-c ^ n?

Add this to config.el and SPC h r r:

(map! :leader
      (:prefix ("d" . "smerge")
        "n"  #'smerge-next
        "u"  #'smerge-keep-upper
        "l"  #'smerge-keep-lower
        ))

From Henrik:

There’s a smerge hydra on SPC g m if you have :ui hydra enabled

See ui/hydra