After screwing around with Magit rebasing, I ended up with a commit that includes a bunch of diff markers in a file:
<<<<<<< HEAD ======= foo <<<<<<< variant A >>>>>>> variant B bar ======= end >>>>>>> f8e1563... Stuff
Apparently this is a "nested conflict" that
smerge can't resolve. Is there a way to use one of Emacs' diff tools to get rid of this, or do I just need to edit it by hand?
Fortunately, there's only a few. Nonetheless, it's unfortunate that commits are allowed to get into a "bad state" such as this.
: I believe this is because I forgot to stage before continuing a rebase