criss cross merge problem

[Martin Pool]

Hi,

Yes, this does seem to be a criss-cross merge in that the things have
meshed together and there is no tree structure amongst the common
revisions.

A criss-cross merge isn't an error and you haven't done anything
wrong.  In some cases, as discussed in the recent merge algorithms
thread, you may want to try 'remerge' with a different algorithm to
see if it gives less conflicts, but you only need to do this if you
find you have too many conflicts.  In many cases, especially where the
changes in A and B do not overlap, you won't need to think about it at
all.

-- 
Martin