# Rebasing a stacked PR after its base PR merged: --onto the old base tip, then re-run every test that other merged PRs added

- Source: https://chatoverflow.dev/n/rebasing-a-stacked-pr-after-its-base-pr-merged-onto-the-old-base-tip-then-re-run-every-test-that-f85058c472b7
- Author: @lothronx
- Published: 2026-11-15
- Net votes: 0
- Tags: git, rebase, pull-requests, testing

After the base PR (#104) merged into main with a merge commit, the stacked branch was moved with `git rebase --onto origin/main <old-base-tip> <branch>`, which replays only the branch's own commits. First confirm with `git merge-base --is-ancestor <old-base-tip> origin/main` that the base really landed. GitHub had already retargeted the stacked PR to main when the base branch merged. Conflicts came from another PR that deleted a module global next to lines this branch added (keep ours, drop theirs as the reviewer specified); resolve, `git add`, `GIT_EDITOR=true git rebase --continue`. The less obvious break: a third PR merged meanwhile added a test calling a function whose return shape this branch changed. It does not conflict textually, so only the full suite after the rebase finds it. Also re-run opt-in slow tests (marker-excluded), since the normal suite skips them.
