Re: [Monotone-devel] more merge problems

[Nathaniel Smith]

Here's what I think's going on:

On Fri, Apr 16, 2004 at 10:25:25PM -0600, Derek Scherger wrote:
> monotone: conflict: maps left add map and right add map disagree: file2 -> 
> c4dfab5d296f28ec2863c3793b7b68fc416f15c7 and 
> 2639ab96dcdb673ec3010a40dd54cdc4b77ee4d1

This seems to indicate that in both branches you added a file called
"file2", but the files added were different.  If you had a file called
"file2" in the common ancestor and then edited it to be different in
each branch, that would work fine, but this is a different; it's a
tree layout conflict, not a within-file textual conflict.  Monotone
currently has no way to deal with tree layout conflicts, and just
bails out as you see...

(Does anyone out there have experience with bitkeeper, and can say how
they deal with tree layout conflicts, esp. at the UI level?  It's not
obvious what to do...)

-- Nathaniel

-- 
"Of course, the entire effort is to put oneself
 Outside the ordinary range
 Of what are called statistics."
  -- Stephan Spender