Re: Why can't git-rebase back up?

From: Junio C Hamano <junkio@cox.net>
Date: Feb 18, 2006, 09:15 UTC
Message-ID: <7vpsllowo2.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060218085608.30325.qmail@science.horizon.com>

linux@horizon.com writes:

Show 6 quoted lines

> That also lets you do something about the rebasing-a-merged-branch
> problem.  If you have:
>
>       g-->h-->i-->j topic
>      /       /
> a-->b-->c-->d-->e-->f master

Ideally, you should be able to come up with:

                        g'->h'->j' topic
                       /
  a-->b-->c-->d-->e-->f master

But it should not matter. You should not be merging master (or any other branches that might have interaction with the topic) into your topic branches to begin with.

Instead, use a separate test branch and merge both topic and master into it:

             g-->h-->j topic
            /         \       
           /---o---o---o test
          /       / 
     a-->b-->c-->d-->e-->f master

Once your topic is fully cooked, you would merge it into master. If the area topic and master touch overlaps, you might have to resolve the same conflict you would have already resolved when you merged (j) commit into test in the above picture, but that is why we have "git rerere" ;-).

BTW, why are we suddenly having many nameless people on this list, I wonder...