From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Strange response after merge from upstream
Date: Wed, 02 Dec 2009 09:29:30 -0500 [thread overview]
Message-ID: <jwvfx7t30yr.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87ljhl500o.fsf@telefonica.net> ("Óscar Fuentes"'s message of "Wed, 02 Dec 2009 08:05:11 +0100")
> `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.
Stefan
next prev parent reply other threads:[~2009-12-02 14:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 19:20 Strange response after merge from upstream Eli Zaretskii
2009-12-01 22:04 ` Stefan Monnier
2009-12-01 22:21 ` Andreas Schwab
2009-12-02 1:54 ` Stefan Monnier
2009-12-02 2:09 ` Óscar Fuentes
2009-12-02 4:29 ` Stefan Monnier
2009-12-02 10:48 ` Andreas Schwab
2009-12-01 22:23 ` Alexander Belchenko
2009-12-02 4:15 ` Eli Zaretskii
2009-12-02 4:56 ` Óscar Fuentes
2009-12-02 5:58 ` Eli Zaretskii
2009-12-02 6:26 ` Óscar Fuentes
2009-12-02 10:53 ` Eli Zaretskii
2009-12-02 14:31 ` Stefan Monnier
2009-12-02 17:40 ` Eli Zaretskii
2009-12-02 6:14 ` Stephen J. Turnbull
2009-12-02 7:05 ` Óscar Fuentes
2009-12-02 14:29 ` Stefan Monnier [this message]
2009-12-02 17:44 ` Óscar Fuentes
2009-12-02 19:37 ` Stefan Monnier
2009-12-02 17:55 ` Alexander Belchenko
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvfx7t30yr.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).