[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Incorrect merge

From: Stephen J. Turnbull
Subject: Re: Incorrect merge
Date: Wed, 03 Nov 2010 16:47:25 +0900

Ó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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]