Immediate merge of a bundle vs branch -r + pull and later merge

[Michael Hudson]

John Arbash Meinel wrote:
> Andrew Cowie wrote:
>> Had a bit of an experiment today: thus far I've rather frantically been
>> doing
> 
>> (1)
>>         $ cd working
>>         $ bzr merge ~/Desktop/whatever.bundle
> 
>> into my working directory branch, then with a whack of changes that need
>> committing to merge.
> 
>> My situation is that and I have typically needed to carry out a
>> considerable number of changes to fix up the submissions before
>> accepting them as 'mainline' worthy. Until now I have been doing this
>> during the merge commit, which has been working well enough. ie
> 
>> (1a)
>>         [resolve conflicts *and* make changes]
>>         $ bzr commit
>>         $ bzr push ../mainline
> 
> 
> I would probably have a 'staging' branch, that you can pull changes into, and
> then merge them into mainline as a separate step.

Could this reply get made into documentation or a blog post somehow?
It's good stuff.

Cheers,
mwh