Skip to content

Retry transient merge rejections - #11

Merged
timkpaine merged 1 commit into
mainfrom
agent/retry-blocked-merges
Aug 11, 2026
Merged

timkpaine merged 1 commit into
mainfrom
agent/retry-blocked-merges

Conversation

@timkpaine

Copy link
Copy Markdown
Member

Concurrent automerge events can both observe mergeable pull requests before one changes the base branch. GitHub then rejects the second merge, and the worker previously stopped without refreshing that pull request.

Retry rejected merges up to three total attempts, refreshing full eligibility and waiting for GitHub mergeability recalculation between attempts. Permanent branch-protection failures remain bounded.

Adds regression coverage for the concurrent merge race and retry limit. Validated with npm test, npm run check, npm run format:check, and npm run build.

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
@timkpaine
timkpaine marked this pull request as ready for review August 11, 2026 22:03
@timkpaine
timkpaine merged commit 49268e5 into main Aug 11, 2026
1 check passed
@timkpaine
timkpaine deleted the agent/retry-blocked-merges branch August 11, 2026 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant