Conflict resolution using Emacs

[Eli Zaretskii]

> From: Patrick Doyle <wpdster at gmail.com>
> Date: Tue, 24 Jan 2012 15:53:39 -0500
> 
> Can anybody share wisdom with me regarding the use of Emacs to resolve
> conflicts created by a merge?

If you are talking about text conflicts, then just editing the result
of the merge will automagically turn on a special minor mode (smerge,
I think) that will help you.  It will also invoke "bzr resolve"
automatically for you, as you resolve the conflicts.