Open BenBE opened 3 years ago
Let's assume the following layout:
A --> B -> C -> D -> E -> F (main) \ \ \> G -----+> H -> I -> J (topic)
And D should be fix-up'd into B, with H merging in the new C', thus resulting in:
D
B
H
C'
A --> B' --> C' --> E' --> F' (main) \ \ \> G -------+--> H' --> I' --> J' (topic)
Level Complexity: intermediate/advanced (possible with both git reset+git merge+git cherry-pick or using git rebase -i.
git reset
git merge
git cherry-pick
git rebase -i
Intended solution: Using git rebase with merge-preservation options.
git rebase
Let's assume the following layout:
And
Dshould be fix-up'd intoB, withHmerging in the newC', thus resulting in:Level Complexity: intermediate/advanced (possible with both
git reset+git merge+git cherry-pickor usinggit rebase -i.Intended solution: Using
git rebasewith merge-preservation options.