[RFC][PATCH] New options to choose fast-forwarding on merge.

[Aaron Bentley]

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

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.

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

iD8DBQFFYbCw0F+nu1YWqI0RAt5qAJ9ODSmBZoqsKngV9g14p68xDi2nAACgh0tT
u4AbLUh/V6vUaalwNzp2iig=
=oDMA
-----END PGP SIGNATURE-----