monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Dmitry Kakurin
Subject: [Monotone-devel] How do I merge 2 unrelated branches into 1 ?
Date: Tue, 3 Oct 2006 10:50:11 -0700

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 ?




reply via email to

[Prev in Thread] Current Thread [Next in Thread]