criss cross merge problem

[Martin Pool]

On 30 September 2010 17:52, Martin Pool <mbp at canonical.com> wrote:
> 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.

I meant to say relevant recent revisions, and also to say that
probably our ui explaining this is unnecessarily alarming.

What I would like to do is gently suggest that if people don't like
the conflicts they got, they can get a different, possibly better, set
by trying a different merge algorithm.  Any ideas?  Perhaps we should
just say nothing except mention this in the merge/conflicts help
topics and manual.

-- 
Martin