Resolving conflicts with Bazaar Explorer

[Gary van der Merwe]

On Wed, Nov 25, 2009 at 6:46 AM, David Muir <davidkmuir at gmail.com> wrote:
> 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?

I've submited a merge proposal to change extmerge to allow for this
(/me nudges Erik). The proposal is here:
https://code.edge.launchpad.net/~garyvdm/bzr-extmerge/more_sets/+merge/13991
. If you install that branch, and then add this to your bazaar.conf:

external_merge = meld %t %r %o

It will have the allmost merged file in the middle. You can also do:

external_merge = meld %t %b %o

But then you will have to do save as, so we really need a %B parameter
to make that work well.


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

I am working towards having a meld style editor in qbzr, that will
nicely integrated with annotate/log and resolve. But that will be a
few months away.


Gary