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

Re: Disappearing change on pull rebase

From
PVPhilippe Vaucher <philippe.vaucher@gmail.com>
Date
Nov 11, 2011, 10:08 UTC
Message-ID
<CAGK7Mr6GHNXLCaP94-peUd2TgBn16boLDVKkniPi-=p_WdV7LA@mail.gmail.com>
In-Reply-To
<4EBCF34A.3090908@viscovery.net>
Show 9 quoted lines
>> Doesn't this create a problem if you pull, resolve a conflit but do NOT
>> push, then pull --rebase some more commits later on? As I understand
>> it, the conflict resolution commit will be a merge commit and will be
>> thrown away by the git pull --rebase.
>
> You are correct, but it is not a problem: During the rebase, the same
> conflicts will arise as during the merge, and you will be forced to
> resolve them before you can complete the rebase. Therefore, nothing will
> be lost.

Doing the same conflict resolution twice is kinda irritating... but ok, fair enough. I guess when you resolve a conflict you're supposed to push to avoid this :)

Philippe
Previous: Johannes SixtNext: Junio C Hamano
Message 7 of 8 in “Disappearing change on pull rebase”
  1. Pitucha, Stanislaw IzaakNov 10, 2011
  2. Kirill LikhodedovNov 10, 2011
  3. Pitucha, Stanislaw IzaakNov 10, 2011
  4. Johannes SixtNov 11, 2011
  5. Philippe VaucherNov 11, 2011
  6. Johannes SixtNov 11, 2011
  7. Philippe VaucherNov 11, 2011
  8. Junio C HamanoNov 11, 2011

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.