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

Understanding rebase

From
Yang Zhang <yanghatespam@gmail.com>
Date
Nov 6, 2008, 22:23 UTC
Message-ID
<49136E60.4090605@gmail.com>
What properties must commits have for them to be rebase-able?
One example arrangement that would cause a rebase to fail is:
- change lines 10, 12, 14 in branch A
- change lines 11, 13, 15 in branch B

These changes are commutative (I believe), but that is insufficient for avoiding conflicts on a rebaes. For a concrete example of this, see:

http://assorted.svn.sourceforge.net/viewvc/assorted/sandbox/trunk/src/git/gitsvn.bash?revision=1065&view=markup

Another question that probably gets at the same thing: I understand what rebasing gives me from a high level (rearranging a branch of commits to be in a series with another branch), but is there a simple explanation of how, precisely, this is accomplished?

Thanks in advance!
-- 
Yang Zhang
http://www.mit.edu/~y_z/
Message 1 of 1 in “Understanding rebase”
  1. Yang ZhangNov 6, 2008

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.