[Monotone-devel] Re: tid 539 clobbered tid 482

[Peter Simons]

 >   $ monotone propagate org.example.src.vendor org.example.cxx
 >   monotone: propagating org.example.src.vendor -> org.example.cxx
 >   monotone: [source] 070048c653c0df0efe467d469fe5accb24443a70
 >   monotone: [target] 2d4fee622514a529d5e120f566cb7e14368a7e04
 >   monotone: common ancestor a16be684f16a59b397dfc9854ad4087e291aee54 found
 >   monotone: trying 3-way merge
 >   monotone: misuse: unable to resolve dir conflict 'lib/blast' -> 
 > 'blast/src/cpp' vs. 'blast-src'

This problem is causing me a lot of trouble, because I
essentially can't use that branch anymore. Does anyone have
an idea how to fix this? I wouldn't mind losing information
as long as merging/propagating works again afterwards.

Peter