Add comprehensive guide for combining multiple pull requests

[Copilot]

Developers frequently need to combine related PRs for cleaner review and merge history, but lack documented workflow patterns.

Changes

• New Documentation: docs/COMBINING_PULL_REQUESTS.md (636 lines)

  • Quick reference table mapping intent to method
  • Four complete workflows: cherry-pick, merge, rebase-squash, manual
  • Context-Sync specific examples for each method
  • Troubleshooting guide covering conflicts, force-push, lost changes
  • Best practices for before/during/after combination

• README Updates

  • Added reference under Contributing section
  • Linked in Documentation section

Methods Covered

Cherry-Pick (Recommended) - Selective commit control:

git checkout -b combined/features
git cherry-pick abc123f  # PR 1 commit
git cherry-pick def456a  # PR 2 commit
git push origin combined/features

Merge Branches - Preserve full history:

git checkout -b combined/features
git merge --no-ff pr-branch-1
git merge --no-ff pr-branch-2

Rebase & Squash - Linear history:

git checkout -b combined/features
git merge pr-branch-1
git rebase pr-branch-2
git rebase -i main  # Interactive squash

Manual Merge - Complete control via manual file edits

Each method includes conflict resolution, Context-Sync test commands (pnpm typecheck, pnpm validate), and decision criteria.

Original prompt

how do I combine multiple pull requests into 1

---

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.