Resolving conflicts with Bazaar Explorer

[Maritza Mendez]

I admit it took me longer than I expected to get extmerge working.
But now that I do I am very happy.  I use BeyondCompare3 but kdiff and
diffuse are also very good tools.  I prefer invoking extmerge better
than Bazaar Explorer for resolving conflicts because the former is
more intuitive and seems to 'flow' better when meeting as a team to
resolve conflicts.  Our conflicts are usually trivial but about once a
month we have one that needs face to face discussion and the extmerge
tools are great for that.

~M


On 11/25/09, Talden <talden at gmail.com> wrote:
> On Thu, Nov 26, 2009 at 3:44 AM, Gordon Tyler <gordon at doxxx.net> wrote:
>> So it looks like bzr extmerge handles kdiff3 automatically. If it finds on
>> the path, it uses the correct command line.
>>
>> However, I don't think this is the case for bzr explorer's external merge
>> tools so you have to give the command line:
>>
>> /path/to/kdiff3 --output %r %b %t %o
>>
>> It would be nice if bzr explorer used bzr extmerge.
>
> And I have this one for Beyond Compare 3
>
> external_merge = 'c:/Progra~1/Beyond~1/BComp.exe %t %o %b %r'
>
> --
> Talden
>
>