From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: Phil Susi <phillsusi@gmail.com>, git@vger.kernel.org
Subject: Re: What happened to having to recover from upstream rebase?
Date: Wed, 13 May 2015 11:44:06 +0200 [thread overview]
Message-ID: <vpq617wzuah.fsf@anie.imag.fr> (raw)
In-Reply-To: <b1686e402e9459e58acc7700a12f377d@www.dscho.org> (Johannes Schindelin's message of "Wed, 13 May 2015 11:37:18 +0200")
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> Hi Phil,
>
> On 2015-05-11 21:50, Phil Susi wrote:
>> So it used to be that when upstream rebased, you'd get an error when
>> you tried to pull again
>
> Not necessarily. You would get this error *only* if there was a merge
> conflict between the revisions (one revision being your
> remote-tracking branch *before* the pull, the other revision being
> your remote-tracking branch *after* the fetch implied by the pull).
However, you would get an error if you try to *push* (non-fast forward,
because the remote has new commits which are different from yours even
though they represent similar changes). And one solution to this error
would be some rebase or reset magic.
So, Phil, that may be the error you remember.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
prev parent reply other threads:[~2015-05-13 9:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 19:50 What happened to having to recover from upstream rebase? Phil Susi
2015-05-13 9:37 ` Johannes Schindelin
2015-05-13 9:44 ` Matthieu Moy [this message]
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=vpq617wzuah.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=phillsusi@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.