Problem
When multiple agent PRs are open and one merges, the others fall behind main. With strict: true, auto-merge blocks until the branch is rebased.
Solution
PR Rescue Workflow (pr-rescue.yml)
- Triggers on push to main (fires whenever a PR merges)
- Finds open
aw-labeled PRs with auto-merge enabled that are behind main and already approved
- Rebases them onto latest main
- CI reruns on rebased commit, existing approval survives, auto-merge fires
Branch Protection Changes
dismiss_stale_reviews: true → false — approvals survive rebase. Safe for solo-dev repo.
required_conversation_resolution: false → true — all review threads must be resolved before merge.
Quality Gate: label marker
- Added
add-labels safe-output — applies quality-gate-approved label on approval
Documentation
Related
Problem
When multiple agent PRs are open and one merges, the others fall behind main. With
strict: true, auto-merge blocks until the branch is rebased.Solution
PR Rescue Workflow (
pr-rescue.yml)aw-labeled PRs with auto-merge enabled that are behind main and already approvedBranch Protection Changes
dismiss_stale_reviews:true→false— approvals survive rebase. Safe for solo-dev repo.required_conversation_resolution:false→true— all review threads must be resolved before merge.Quality Gate: label marker
add-labelssafe-output — appliesquality-gate-approvedlabel on approvalDocumentation
Related