Git rebase branch with merged children
Today I faced with one problem. My teammate created branch from master. He developed one feature in this branch and after that developed two subfeatures in subfeature’s branches. At last he did two refactoring commit of the entire thing. So…
C--D E--F | subfeatures / \ / \ B------M1------M2--G--H | feature / A-------------------K | master
B'--C'--D'--E'--F'--G'--H' / A--K
Of course pointers of C & D became wrong so I also get two subfeature branches growing ‘from air’. I understand how to fix it if subfeature branches wasn’t merged into feature, but at this time I was confused. I cherry-picked everything in rebased recovery branch and merged all again. Is here a easier way to do it?
2 Solutions collect form web for “Git rebase branch with merged children”
Note that you need a git1.7.6+ for
git rebase --preserve-merges to work properly.
rebase --preserve-merges --ontodidn’t work before (“
git rebase --preserve-merges --ontodoesn’t preserve merges”)
rebase --preserve-mergeshad issue in some instance:
- see this thread, when both sides of the merge are replayed)
- “Git: Rebasing Merge Commits ” (post from Alexandru Pasca)
Long story short: You just completed a merge and somebody has pushed a commit before you were able to push yours. The solution is to make git aware of the merge you did.
git rebase --preserve-merges <upstream>
git rebase -p <upstream>
But there’s a problem, if your merge had conflicts that you solved they won’t be picked up by the rebase machinery.
And you will end up resolving the conflicts again … at least this is the case with git version 22.214.171.124
(That would call for
Did you cherrypick every commit one by one by hand?
git rebase -i master feature and rewrite the history as you please.