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

[Benjamin Place]

I'm trying to propagate some changes between two branches, and I'm getting:

   mtn: warning: resolve non-content conflicts and then try again.
   mtn: error: merge failed due to unresolved conflicts
   mtn: warning: rename target conflict: nodes 505, 485, both want
parent 347, name FileName.java
   mtn: warning: resolve non-content conflicts and then try again.
   mtn: error: merge failed due to unresolved conflicts

Though I'm actually getting it for 5 files, not just one.

Googling around I see discussions of how this should be worded better
for non-monotone-devs, but I can't find a hint of how to proceed.

Thanks,
Ben