[Monotone-devel] Merge conflicts

[Peter Simons]

Hi,

while trying to merge a branch, I got this error message:

  $ mtn merge
  mtn: starting with revision 1 / 3
  mtn: merging with revision 2 / 3
  mtn: [source] 1bfd0c9f4a347913d2573f3bf8b5e3192350f6a8
  mtn: [source] 1f7b551d990fa8d8f64072f6563874312e3ed62d
  mtn: warning: orphaned node conflict on node 20547, dead parent 52, name foo
  mtn: warning: orphaned node conflict on node 20570, dead parent 52, name bar
  [...]
  mtn: warning: resolve non-content conflicts and then try again.
  mtn: error: merge failed due to unresolved conflicts

This is good news: the old version used to fail with an
invariant violation. :-)

How can I resolve those conflicts? Is this problem
documented somewhere?

Peter