Thanks a lot - did it as described and after some trouble because I wasn't clear what I did, it worked. Thanks, Rainer > > > > Hi > > What you want is to rebase B on top of A, which will rewrite B's > history with A as the parent. > > Note I have not tested the below, I encourage you to explore the > commands' man pages before executing. > > Assuming A and B are in separate repos, starting in your local clone > of A, add a "remote" to B and fetch it with: > > git remote add RepoB REPO_B_URL # same URL for cloning B's repo > git fetch RepoB B > > Now you should create a local branch B and rebase it on top of A > > git checkout -b B RepoB/B > git log -1 --decorate # verify you have B checked out > git rebase -i A # an editor will pop up here > > If you have conflicts, that means A and B had changes that cannot > coexist. Remember you are replaying B on top of A, so you might find > some commits in B's past may not apply on the latest commits in A. In > this case you may want to reconsider your strategy - did B *really* > contain only changes *after* A went dormant? > > Once you are done, push your new B to either RepoB or RepoA: > > git push RepoB B:B -- Rainer M. Krug email: Rainer<at>krugs<dot>de PGP: 0x0F52F982 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Description: PGP signature