Re: merge conlict?

[Óscar Fuentes]

Andreas Schwab <address@hidden> writes:

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

Of course it helps. Do you imply that if the bug was introduced by a
merged revision it will go unnoticed? Bisecting mainline will pinpoint
which merge revision introduced the problem. Then, if the merged history
is long enough, the merged branch is recreated and bisect executed
there. Maybe not as convenient as doing it on a single pass, but not so
annoying to justify extending the strict mainline commit requirements to
private branches.