What we did at UBZ

[Aaron Bentley]

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

Jan Hudec wrote:
|>If it's a merge, you won't be able to pull.
|
|
| So please make it so that I will. It's OK if it requires an option to pull
| (though I still don't see a reason why it should not be the default),
| but --overwrite is clobbers too much.

What we're doing right now when you pull after being merged is "pull
convergence", which we were talking about eliminating.  Are you saying
you want to keep things the way they are, or that you want to do
something different when you pull after a merge?

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

iD8DBQFDgLLv0F+nu1YWqI0RAp9tAJ490VwaG/mPTiSUvs4ah/k0Ui6MNwCfV2vY
LZE3HVnNWpGeWXMZAlIBBXU=
=2ZYC
-----END PGP SIGNATURE-----