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

Re: Anomalous conflicts during git rebase

From
Aadr3nald0s@gmail.com <adr3nald0s@gmail.com>
Date
Dec 28, 2007, 15:54 UTC
Message-ID
<m3k5my7r1u.fsf@euroclydon.lan>
In-Reply-To
<alpine.LNX.1.00.0712271840030.13593@iabervon.org>
Daniel Barkalow <barkalow@iabervon.org> writes:
> This will rebase temp0 (= v2.6.16) onto topic/test. This process 
> linearizes the history being rebased, and conflicts in that history (that 
> were resolved in the merges) show up when the second change to those lines 
> gets introduced.

Thank you for the explaination of why this is happening. This is something I had not considered WRT git-rebase.

When you say it linearizes history how is this done. Mentally I still have a model of where the "mainline" is at all times and I assumed that git-rebase was following this mainline. However, upon reflection, I realize this is naïve.

When there is a branch and a subsequent merge, does rebase follow both branches? If so, why does it not use the original merged result for the newly rebased file if there are no conflicts between the original merge result and the file that is being rebased onto as compared to their mutual ancestor?

Thanks again.
-- 
Adr3nalD0S
Previous: Daniel BarkalowNext: Daniel Barkalow
Message 5 of 8 in “Anomalous conflicts during git rebase”
  1. adr3nald0s@gmail.comDec 27, 2007
  2. Johannes SixtDec 27, 2007
  3. adr3nald0s@gmail.comDec 28, 2007
  4. Daniel BarkalowDec 27, 2007
  5. adr3nald0s@gmail.comDec 28, 2007
  6. Daniel BarkalowDec 28, 2007
  7. adr3nald0s@gmail.comDec 28, 2007
  8. Björn SteinbrinkDec 28, 2007

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.