Re: merge conlict?

[Óscar Fuentes]

Andreas Schwab <address@hidden> writes:

> Óscar Fuentes <address@hidden> writes:
>
>> You know, I know, but how bzr knows?
>
> ??? What does this have to do with bzr?

Read again the thread.

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

I do "bisect" maybe twice per year. I commit hundreds of times. Guess
what's more convenient for me.