[Top][All Lists]
[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 ?
- [Monotone-devel] How do I merge 2 unrelated branches into 1 ?,
Dmitry Kakurin <=
- Re: [Monotone-devel] How do I merge 2 unrelated branches into 1 ?, Thomas Keller, 2006/10/03
- [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Bruce Stephens, 2006/10/03
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Matthew A. Nicholson, 2006/10/04
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Nathaniel Smith, 2006/10/04
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Dmitry Kakurin, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Daniel Carosone, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Daniel Carosone, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Dmitry Kakurin, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Daniel Carosone, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Dmitry Kakurin, 2006/10/06