fix: fix: pr-lifecycle gives up on merge conflict (HTTP 405) instead of delegating rebase to agent (#314) #315

Merged

dev-bot merged 1 commit from fix/issue-314 into main

2026-04-06 18:44:02 +00:00

dev-bot commented

2026-04-06 18:38:02 +00:00

Collaborator

Fixes #314

Changes

Fixes #314 ## Changes

dev-bot added 1 commit 2026-04-06 18:38:02 +00:00

fix: fix: pr-lifecycle gives up on merge conflict (HTTP 405) instead of delegating rebase to agent (#314 )

ci/woodpecker/push/ci Pipeline was successful

Details

ci/woodpecker/pr/ci Pipeline was successful

Details

3b1ebb4a3f

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

review-bot commented

2026-04-06 18:42:56 +00:00

Collaborator

AI Review

Summary\n\nSmall, targeted fix. returns for HTTP 405 (merge blocked but not yet merged). The old call site short-circuited on with and gave up. The fix drops that branch so both (other failures) and (HTTP 405) fall through to the agent rebase invocation.\n\n### Checklist\n\n- Logic: Correct. at line 329 still returns for the blocked-but-not-merged 405 case; the caller now treats it identically to a conflict failure and delegates to the agent. The string is propagated verbatim so the agent has context.\n- Dead code: The in is still reachable and meaningful (caller now just handles it uniformly), so nothing becomes dead code.\n- Edge case — protection rules: If HTTP 405 is due to branch-protection rules that a rebase won't fix, the agent will iterate and eventually exhaust its budget rather than silently exit . That's a better outcome than silently giving up.\n- Comment accuracy: Updated comment correctly describes the new behaviour.\n- No security or ShellCheck issues introduced.

Verdict

APPROVE — Correctly removes premature give-up on HTTP 405 and routes it to the existing agent rebase path

Reviewed at 3b1ebb4 | AGENTS.md

## AI Review  ### Summary\n\nSmall, targeted fix. returns for HTTP 405 (merge blocked but not yet merged). The old call site short-circuited on with and gave up. The fix drops that branch so both (other failures) and (HTTP 405) fall through to the agent rebase invocation.\n\n### Checklist\n\n- **Logic**: Correct. at line 329 still returns for the blocked-but-not-merged 405 case; the caller now treats it identically to a conflict failure and delegates to the agent. The string is propagated verbatim so the agent has context.\n- **Dead code**: The in is still reachable and meaningful (caller now just handles it uniformly), so nothing becomes dead code.\n- **Edge case — protection rules**: If HTTP 405 is due to branch-protection rules that a rebase won't fix, the agent will iterate and eventually exhaust its budget rather than silently exit . That's a better outcome than silently giving up.\n- **Comment accuracy**: Updated comment correctly describes the new behaviour.\n- **No security or ShellCheck issues** introduced. ### Verdict **APPROVE** — Correctly removes premature give-up on HTTP 405 and routes it to the existing agent rebase path --- *Reviewed at `3b1ebb4` | [AGENTS.md](AGENTS.md)*

review-bot approved these changes 2026-04-06 18:42:56 +00:00

review-bot left a comment

Collaborator

AI Review: APPROVE — Correctly removes premature give-up on HTTP 405 and routes it to the existing agent rebase path

AI Review: **APPROVE** — Correctly removes premature give-up on HTTP 405 and routes it to the existing agent rebase path