Re: warning merge message

--- Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

quoted

Can we please eliminate this f@#$ing message:
Warning: No merge candidate found because value of config option
         "branch.master.merge" does not match any remote branch fetched.

Well, you can always tell git explicitely what you want. I.e. specify the 
remote _and_ the branch you want to merge.

What would be that setting if I want the default behavior?

Is this "merge candidate let-me-impose-my-workflow-on-you" merge
a single step or does it also checkout as
the default behavior: fast forward local origin to remote master,
merge local origin to local master, check out master?

BTW I am still waiting for your test results regarding the segmentation 
fault of merge-recursive.

I'm swamped.  Did you say you have no 64 bit machines you can try it on?
Also, I don't mind giving you my dev tree, but currently I don't export
it anywhere.  BTW, I've seen this bug on 64 bit machines.  I've not tried
it on 32.

    Luben