Re: [Monotone-devel] Unresolved conflict, want to back out...

[J Decker]

Dealer_editor is a directory.  It exists within the same location in both versions (or would) ... full path is something like 

src/apps/milk/dealer_editor

On 10/26/06, Brian May <address@hidden> wrote:

>>>>> "J" == J Decker <J> writes:

    J> mtn.EXE: [source] 6c5472831fe23406d9107638185f72d7eb96c9e0
    J> mtn.EXE: [target] 530d500ad40b790d2ea1b0986fe1372032434863
    J> mtn.EXE: warning: rename target conflict: nodes 2117, 2081, both want parent 1442, name dealer_editor
    J> mtn.EXE: warning: resolve non-content conflicts and then try again.
    J> mtn.EXE: error: merge failed due to unresolved conflicts

Is dealer_editor a file or a directory?

I think the merge UI isn't yet good enough to do what you want, but
there are some workarounds:

* delete dealer_editor in one on the branches.
* rename dealer_editor in one of the branches, merge, and then fix up.

i.e. remove the source of the conflict before doing the merge.

(I haven't read you email in detail so I apologise if I got something
wrong).

Another problem with the above message is, AFAIK, it doesn't really
say what file has a problem - so if you have two different directories
(with different parents) called dealer_editor, it is not easy to work
out which one it is referring to.
--
Brian May < address@hidden>