[Bug 4741] bzr shelve is confusing to me

[Brad Bollenbach]

On 24-Nov-05, at 3:16 PM, Aaron Bentley wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Brad Bollenbach wrote:
>> A common use case for undo/redo, IME, is waking up in the morning,
>> undo'ing changes I've made on a branch, synching down the latest
>> version of HEAD, and then redo'ing my changes back onto the branch to
>> make sure I'm synched up and the conflict pain is kept to a minimum.
>
> Why is that?  Do you prefer rej files to herringbone conflict markers?

We have a policy that says that we don't mix our changes with merging  
in upstream changes, so I move my changes out of the way, merge and  
commit upstream, then restore my changes and resume my work.

I could also commit first instead, which I sometimes do, but I like  
to try and keep my commits pretty clean rather than, for example,  
committing debugging code.

Cheers,

--
Brad Bollenbach