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

[Ben Finney]

Óscar Fuentes <ofv at wanadoo.es> writes:

> From that document I infer that bzr currently lacks on ability for
> conflict handling.

It can be argued that Bazaar's current behaviour *is* “conflict
handling”, in the sense that a traceback report from Python is
“exception handling”.

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?

-- 
 \       “Sunday School: A prison in which children do penance for the |
  `\              evil conscience of their parents.” —Henry L. Mencken |
_o__)                                                                  |
Ben Finney