Git Rebase: Stacked Branches without Re-resolving Conflicts
This is a common situation in Git when working with stacked feature
branches. You want to rebase a branch (say v3
) onto main
after a previous
branch (v2
) has already been merged into main
, without re-resolving
conflicts that were already handled between v2
and v3
.