Resolving conflicts with Bazaar Explorer

[David Muir]

After using bzr for almost a year, I've hit my first conflict.... and 
now I don't know what to do.
In the past I've used NetBeans and Eclipse to resolve conflicts (for svn 
checkouts). So I did what any gui oriented guy would do and fired up 
Bazaar Explorer.
I have it set up to use meld, so meld dutifully opens up the BASE, THIS 
and OTHER files in a 3 way diff. But now what?  The docs aren't very 
clear about this. They say to either edit the main copy of the file or 
by "invoking external tools on the THIS, OTHER, and BASE versions". Do I 
put all the corrections into THIS, then replace the main file with THIS?

Are there other tools that better understand bzr conflict resolution 
that I could use instead of meld?

Cheers,
David