merge says that a directory is not versioned, but it is

[Óscar Fuentes]

Ben Finney <ben+bazaar at benfinney.id.au> writes:

[snip]

> I assume you mean something different, but there are many distinct
> things you *could* actually mean. Could you describe what you mean by
> “conflict handling”? Also, could you give an example of a system that
> does have the behaviour you describe?

Please see the original post of this thread, and the post with subject
"Puzzled about merge conflicts." published yesterday.