[Monotone-devel] non-content conflict...

[Richard Levitte - VMS Whacker]

Hi,

I've gotten into one of those dreaded non-content conflicts:

  mtn: warning: rename target conflict: nodes 4684, 3223, both want parent 
1296, name examples
  mtn: warning: resolve non-content conflicts and then try again.

I would appreciate it if someone could remind me how to deal with
those.  I'm probably thick-headed, I hope you'll forgive me.

Maybe it's time to start a FAQ?  If you want, I can start it with the
answer for this issue, if I get one (or more).

Cheers,
Richard

-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.

-- 
Richard Levitte                         address@hidden
                                        http://richard.levitte.org/

"When I became a man I put away childish things, including
 the fear of childishness and the desire to be very grown up."
                                                -- C.S. Lewis