How to resolve a directory merge conflict?

[Martin Pool]

2009/8/26 Ringo De Smet <ringo.desmet at gmail.com>:
> Hello,
>
> I am testing Bazaar as a possible target to switch to. Bazaar so far
> is doing a good job in tracking all the rename/merge scenarios I'm
> testing, but I'm a bit blocked on the following and couldn't find this
> in the documentation:
>
> - developer A renames a folder
> - developer B renames the same folder
> - both changes merged together: directory merge conflict
>
> For file merge conflicts, you get the BASE, OTHER and THIS versions,
> but I don't get this for the directory. My main question is:
>
> - How can I select which name I want to pick?
>
> Currently, if I merge B's changes second, my working copy of the
> folder has the name that was given to it by developer B. What if I
> want it to be the one given to it by A?

Basically you just do 'bzr mv' to rename it to the other name - but
see also Vincent's recent thread about better guided conflict
resolution.

-- 
Martin <http://launchpad.net/~mbp/>