Re: Incorrect merge

[Stephen J. Turnbull]

Óscar Fuentes writes:

 > One thing is to resort to cherry-picking when some exceptional condition
 > is detected, and another thing is to use cherry-picking as a tool for an
 > ordinary task.

No, from the point of view of history consistency they're the same.
Cross-branch histories aren't "a little bit inconsistent"; they're
consistent or they're not.  In the first case you can depend on tools
like Bazaar and git to DTRT, and in the latter you can't.