git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
May 13, 2015, 09:44 UTC
Message-ID
<vpq617wzuah.fsf@anie.imag.fr>
In-Reply-To
<b1686e402e9459e58acc7700a12f377d@www.dscho.org>
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
Show 10 quoted lines
> 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/
Previous: Johannes Schindelin
Message 3 of 3 in “What happened to having to recover from upstream rebase?”
  1. Phil SusiMay 11, 2015
  2. Johannes SchindelinMay 13, 2015
  3. Matthieu MoyMay 13, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.