[RFC][PATCH] New options to choose fast-forwarding on merge.
aaron.bentley at utoronto.ca
Mon Nov 20 13:42:08 GMT 2006
-----BEGIN PGP SIGNED MESSAGE-----
Jan Hudec wrote:
> I have implemented two options for the merge command, --pull and --trivial,
I'm against this, because I think that having merge do a pull is a very
destructive operation, and we shouldn't suggest it at all. I think that
it will lead to angry users saying "why did you put that trap there for
me? What do you mean there's no way to fix it?"
I would be much more inclined to support "pull --merge", because I do
find that occasionally, I get my bzr.ab branches out of sync, and then I
want to merge.
I'd like to hear more about how you're using bzr, because I'd like to
find a solution that works for you, but I don't want this one.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar