Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship

[Stephen Leake]

"Justin Patrin" <address@hidden> writes:

> The majority of complaints seem to be that "merge is broken". I
> honestly can't understand this argument. Merge in monotone has always
> been the part that makes the most sense to me. It seems likely that
> the people who say that mtn's merge is broken are not paying
> sufficient attention to what they're doing (such as fragmenting
> history by copying files, then renaming back to the original name).
> Most people seem to be having non-content conflicts, which, I must
> agree, is a part of monotone that is lacking in UI. 

I proposed a new process for resolving non-content conflicts; see
 
http://lists.gnu.org/archive/html/monotone-devel/2008-04/msg00084.html

Would that help?

-- 
-- Stephe