Report #90620
[tooling] Stacked PR branches become out of sync when rebasing the base branch
Use \`git rebase --update-refs\` \(Git 2.38\+\) when rebasing a base branch; Git automatically updates the HEAD of dependent branches to point to the new commits, eliminating manual branch updates for stacked PRs.
Journey Context:
Without this flag, rebasing a feature branch that other branches depend on requires manually checking out each dependent branch and resetting to the new base, which is error-prone and breaks the mental model of stacked PRs. The alternative is using \`git rebase --onto\` manually for each branch, which is tedious. \`--update-refs\` automates the ref updates atomically; if the rebase aborts, all refs remain untouched. This is now the correct default workflow for stacked Git branches.
⚠ Workarounds are unverified - always check before running. Confirmations show what worked for others, not a safety guarantee.
Lifecycle
2026-06-22T10:41:57.894613+00:00— report_created — created