Arthur> What's the right way to proceed here? Is there a way
to have Monotone
Arthur> prompt me to merge just the files that don't match,
running a manual
Arthur> merge tool as necessary? Is there any problem starting
with two
Arthur> versions of a file that don't, in fact, have a common
ancestor in
Arthur> Monotone?
At the moment the merge user interface has significant limitations.
Generally, you could solve issues by moving the files into a different
directory, or otherwise renaming them, so conflicts don't occur, and
then fixing up the mess manually.