Re: rebase problem

[Vincent van Ravesteijn <vfr@lyx.org>]

Op 17-3-2012 13:57, Joakim Tjernlund schreef:
> A co-worker this on our local u-boot repo:
>    git checkout master
>    git fetch denx/master
>    git merge denx/master
> <resolve conflicts>
>    git commit
>    ...
>    git commit
> Now u-boot is working again
> then update to latest u-boot so:
>    git fetch denx/master
>    git rebase denx/master
> Now it is a mess, that rebase seems to start from way back as a
> staring reference, not from the last merge shown above.
> I guess I forgotten how git works, what did go wrong?
>
>    Jocke
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

The situation is like this:

  master - C - o - o - D - o - o - o - A
                      /
  denx/master- - - - o - o - o - o - B

Now, you ask to rebase master (A) onto denx/master (B). If master would 
have started from D, it would indeed apply the commits D -- A on top of 
B. In your case, however, master already had a lot of commits that were 
not in denx/master: C -- D  (including the merge resolution). So it will 
also apply C -- D on top of  B.

Vincent