Re: merge conlict?

[Andreas Schwab]

Óscar Fuentes <address@hidden> writes:

> Unless you take the "technically" part as "no code was lost", I beg to
> differ. A simple `bzr log' will show that the commits of the last few
> days are gone from the listing. You need to add the `-n2' parameter to
> see them as merged history under Mark's commit.

That's only a UI problem.  There is nothing lost in terms of history.

> Oh, and apart from this problem and producing a huge diff, it breaks
> bisection.

How?

Andreas.

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