Right now the problem is that monotone thinks you are trying to
merge two
completely different files that happen to have the same name. This
probably
isn't what you want.
What you want to do is merge the content of two files. One way to
do that is to
synthesize some ancestry for the files you want to merge. It
doesn't need to be
much, you just need to tell monotone that the two files are
descended from the
same ancestor. When monotone knows you are trying merge files with
a common
ancestor, then it will try to merge their contents.
Here's how you'd do that: