Re: merge conlict?

[Andreas Schwab]

Óscar Fuentes <address@hidden> writes:

> Please note that it is not a question of bisect or not bisect. It is
> always possible to bisect following the leftmost part of the history (as
> long as people do not get accustomed to push their changes onto trunk
> and break that) and it is possible to re-create the original branch and
> bisect it.

That does not help if the bug is buried in the other part.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."