Re: Anomalous conflicts during git rebase

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Dec 27, 2007, 23:45 UTC
Message-ID: <alpine.LNX.1.00.0712271840030.13593@iabervon.org>
In-Reply-To: <m3ir2ju5ce.fsf@euroclydon.lan>

On Thu, 27 Dec 2007, adr3nald0s@gmail.com wrote:

Show 9 quoted lines

> 
> On a clone of linux-2.6:
> 
>     git checkout -b topic/test v2.6.15
>     touch drivers/a-file.c
>     git add drivers/a-file.c
>     git commit -m 'Add a file'
>     git checkout -b temp0 v2.6.16
>     git rebase topic/test

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.

What you probably want is

...
 git commit -m 'Add a file'
 git checkout -b temp0
 git rebase v2.6.16

	-Daniel
*This .sig left intentionally blank*