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

[Jari Aalto]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> 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'm in favor of this. I also find that when I tried to "pull", I
actually needed "merge".

It would be good is this behaviour could be be configured permanently
in the bzr configuration file. I'can't think any case for myself not
wanting always to do "pull --merge".

Jari