[Top][All Lists]

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

Re: [Monotone-devel] non-content conflicts

From: jack-monotone
Subject: Re: [Monotone-devel] non-content conflicts
Date: Mon, 4 Feb 2008 22:14:43 -0800
User-agent: Mutt/1.4.1i

On Tue, Feb 05, 2008 at 02:43:51PM +1100, Christopher Vance wrote:

> mtn: warning: rename target conflict: nodes 13, 9, both want parent 1,
> name joint
> mtn: warning: resolve non-content conflicts and then try again.
> mtn: error: merge failed due to unresolved conflicts

> I think it's complaining about both branches having the same directory
> created after the branches diverged. What does mtn want me to do to
> fix this?
> Should I just rename one of the directories to something else, move
> the content over, and remove the now empty directory?

Yep. That's exactly what to do. 


Jack (John) Cummings                 
PGP fingerprint: F18B 13A3 6D06 D48A 598D  42EA 3D53 BDC8 7917 F802

reply via email to

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