Re: [Monotone-devel] "warning: resolve non-content conflicts..."

[Brian May]

>>>>> "William" == William Uther <address@hidden> writes:

    William> # notice what has happened.  The two different files,
    William> each called "a- file" are now in the "same" place.  # if
    William> you try to propagate in either direction you should get a
    William> conflict similar to the one you reported.  # the solution
    William> is to move one of the "a-file"s so that they are not
    William> trying to be in the same place, which # is what I
    William> suggested above.

Pretty good description. Note though that the problem will occur even
if the files have identical content. Monotone still will treat them as
two different files because they were created two times.
-- 
Brian May <address@hidden>