Subject: Re: What happened to having to recover from upstream rebase?

From: Matthieu Moy <[email-masked]>
Date: Wed, 13 May 2015 11:44:06 +0200

Johannes Schindelin <[email-masked]> 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/