Managing Stacked Pull Requests

What problem does it solve?

When working with PR trains (pr1 → pr2 based on pr1, etc.), you need to update the dependent PRs after merging the base PR. This skill shows how to rebase dependent PRs onto the updated base branch using a cherry-pick workflow.

Core Features & Use Cases

• Identify commits unique to a dependent PR
• Cherry-pick those commits onto the updated base branch
• Update the remote branch with force-with-lease
• Repeat for entire PR stack
• Handle both main and master base branches

Quick Start

• Step 1: Update pr2
  • git fetch origin
  • git checkout origin/pr2
  • git log --oneline
  • git checkout origin/main
  • git cherry-pick <commit-hash1> <commit-hash2> ...
  • git push origin HEAD:pr2 --force-with-lease
• Step 2: Update pr3
  • git checkout origin/pr3
  • git log --oneline
  • git checkout origin/pr2
  • git cherry-pick <commit-hash1> <commit-hash2> ...
  • git push origin HEAD:pr3 --force-with-lease