Re: merge conlict?

[Andreas Schwab]

Óscar Fuentes <address@hidden> writes:

> There is no concept of "big merge" on bzr. (nor on git, AFAIK)

If you merge a long development branch, then that's a big merge.

> So either you include the merged revisions and cope with unstable
> intermediate points or you ignore them, locate the merge point where
> the problem was introduced on mainline, and then proceed to bisect the
> branch that originated that merge point.

That's exactly what bisect does, automagically.  If you are careful with
your history, then this just works.

Andreas.

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