Resolving conflicts with Bazaar Explorer

[DeeJay]

2009/11/25 Gordon Tyler <gordon at doxxx.net>:
> DeeJay wrote:
>>
>> There is a blog entry about it here -
>>
>> http://bazaarvcs.wordpress.com/2009/11/08/new-working-tree-features-in-qbzr/
>
> Although that's qbzr, not Explorer (v0.9.0). Explorer's Conflicts window
> still doesn't handle it correctly. It only gives the BASE, THIS and OTHER
> file to kdiff3, it doesn't give the output file (i.e. original), so when you
> save your merge in kdiff3, it goes into the OTHER file and you have to copy
> that over the original to get the conflict resolved.
>
> From the qcommit window, selecting Merge conflict invokes kdiff3 correctly.
>
>

As I understand it, qbzr and explorer are not mutually exclusive
independent facilities. It says at http://bazaar-vcs.org/BzrExplorer -

'BzrExplorer provides most of its functionality by calling out to
mini-applications provided by "application suites", namely the QBzr
and bzr-gtk plugins. '

I think that if your qbzr plugin is 0.16.0 or later, and you have the
extmerge plugin installed and configured as noted in Garry's blog,
then the option to detect, deconflict and resolve conflicts will be in
the Browse and Commit menus of Bzr Explorer. They are for me, and make
sorting out conflicts almost elegant.