[Bug 4741] bzr shelve is confusing to me

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Brad Bollenbach wrote:
> On 24-Nov-05, at 3:16 PM, Aaron Bentley wrote:
>> 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.

Ah.  Sorry, I thought you were referring to pull, not merge.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDhi980F+nu1YWqI0RAhQ3AJ0eFXB2AzNjX/Sawo9rG0Zy4UwHQwCcD9JS
yaGihCcAgAxGGXrsjIJHoV4=
=MQRN
-----END PGP SIGNATURE-----