Re: [Monotone-devel] How do I merge 2 unrelated branches into 1 ?

[Thomas Keller]

Dmitry Kakurin schrieb:
> I have two unrelated branches called HSM and Main. Now I want to
> combine them into one.
> But this is what I'm getting:
>
> U:\Work>mtn propagate HSM Main
> mtn: propagating HSM -> Main
> mtn: [source] 94253d793cff0104c03589793756f7420df11aa4
> mtn: [target] ad0b531e0093c2aa4f02e70b908e550784962082
> mtn: warning: rename target conflict: nodes 55, 1, both want parent 0, name
> mtn: warning: resolve non-content conflicts and then try again.
> mtn: error: merge failed due to unresolved conflicts
>
> What does it mean and how do I fix it ?

This means that two files/directories are equally named but have no 
common ancestry. However I can't tell you what two entries these are 
from the node numbers. Note to devs: Wasn't this supposed to be made 
more user friendly i.e. so it outputs file paths instead of those numbers?

Thomas.

--
- "I know that I don't know." (Sokrates)
Guitone, a frontend for monotone: http://guitone.berlios.de
Music lyrics and more: http://musicmademe.com