Re: merge conlict?

[Andreas Schwab]

Óscar Fuentes <address@hidden> writes:

> You know, I know, but how bzr knows?

??? What does this have to do with bzr?

> "being careful with you history" means not committing things to local
> branches that you wouldn't commit directly to trunk? I think such policy
> would be counterproductive,

It is of great value to make your revisions bisectable.  Again, I'm
speaking from experience.

Andreas.

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