Bazaar Workflow

[Jelmer Vernooij]

Philippe Lhoste wrote:
> On 06/04/2009 18:16, Philippe Lhoste wrote:
>> Ah, and after merge, we still have to commit changes, while pull does
>> all this in the same stroke.
>
> Ah, that's the culprit of pull! Uncommitted changes are committed,
> ready or not. Good to know. merge --force seems to be the path to take
> in such case.
Pull does *not* automatically commit your local uncommitted changes. It
will merge upstream changes into your working tree, just like "bzr merge
--force" does. I don't think there are any Bazaar commands except for
"bzr commit" itself that automatically commit your local uncommitted
changes.

Cheers,

Jelmer