Re: Strange response after merge from upstream

[Stefan Monnier]

>>> `pull' never merges because there is nothing that can cause conflicts.
>> 
>> Oh, so that's the misconception from which comes the stupid idea
>> that --show-base would only apply to merge but not to pull?
>> 
>> FYI, this is not true: it has to merge the incoming patches with the
>> local uncommitted changes.

> Yes, IMO that feature is so wrong that I forgot about it.

> By default, `pull' should refuse to operate if there are local edited
> files. If you often work on that scenario, you'll better use a bound
> branch and `update' instead of `pull'.

Yes, well, that's indeed my situation, and my branch is bound and I use
`update', tho I also use `pull' because it makes no difference.
The problem is still the same: it doesn't take a --show-base argument.


        Stefan