From: Luben Tuikov <ltuikov@yahoo.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: warning merge message
Date: Thu, 21 Dec 2006 16:25:23 -0800 (PST) [thread overview]
Message-ID: <121430.93915.qm@web31808.mail.mud.yahoo.com> (raw)
In-Reply-To: <Pine.LNX.4.63.0612211022280.19693@wbgn013.biozentrum.uni-wuerzburg.de>
--- Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > 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
next prev parent reply other threads:[~2006-12-22 0:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-20 21:22 warning merge message Luben Tuikov
2006-12-21 9:23 ` Johannes Schindelin
2006-12-22 0:25 ` Luben Tuikov [this message]
2006-12-22 0:43 ` Shawn Pearce
2006-12-22 0:49 ` Junio C Hamano
2006-12-22 6:00 ` Junio C Hamano
2006-12-22 20:42 ` Josef Weidendorfer
2006-12-22 21:12 ` Junio C Hamano
2006-12-22 22:49 ` Josef Weidendorfer
2006-12-22 23:00 ` Junio C Hamano
2006-12-23 0:05 ` Josef Weidendorfer
-- strict thread matches above, loose matches on Subject: below --
2006-12-20 21:34 Luben Tuikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=121430.93915.qm@web31808.mail.mud.yahoo.com \
--to=ltuikov@yahoo.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).