Conflict resolution using Emacs

[Barry Warsaw]

On Jan 24, 2012, at 03:53 PM, Patrick Doyle wrote:

>Can anybody share wisdom with me regarding the use of Emacs to resolve
>conflicts created by a merge?

smerge-mode ftw!

I'm using Emacs 23.3 on Ubuntu precise and I don't think I've actually done
anything explicit to enable it.  When I get a conflict, in same file.c, I just
visit the file and notice that smerge-mode is enabled.  There are then
keybindings that let you move forward and backward through the conflicting
sections, and choose which (or both) region to keep.  There are some other
interesting keybindings, although all are a little hard to reach.  Just C-h m
when you visit a conflicting file and search the help for 'smerge' for
details.

Oh, and the coolest thing is that once you've resolved all the conflict
sections in the file, smerge-mode will automatically do the bzr command to
mark the file resolved.

I have noticed though that smerge-mode doesn't work well with Mercurial, but
who cares about that? :)

Cheers,
-Barry