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, 09:50 UTC
Message-ID
<CAGK7Mr6D6-4aNceTDCYTHabA3vnxh+uvQ=GOeS_3nrL9rjmc9w@mail.gmail.com>
In-Reply-To
<4EBCC71D.6000505@viscovery.net>
Show 5 quoted lines
> This is by design. Rebase does not rebase merge commits because it is
> assumed that merge commits only do what their name implies - to merge
> branches of a forked history. As such, they do not introduce their own
> changes. Follow this rule, i.e., make your change in a separate non-merge
> commit, and you are fine.

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.

Philippe
Previous: Johannes SixtNext: Johannes Sixt
Message 5 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.