From 3b1ebb4a3fe6a68a2a28d7741110dd51a7fe3a6c Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 6 Apr 2026 18:37:56 +0000
Subject: [PATCH] fix: fix: pr-lifecycle gives up on merge conflict (HTTP 405)
 instead of delegating rebase to agent (#314)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 lib/pr-lifecycle.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/pr-lifecycle.sh b/lib/pr-lifecycle.sh
index 50f2df1..2bb64e1 100644
--- a/lib/pr-lifecycle.sh
+++ b/lib/pr-lifecycle.sh
@@ -474,11 +474,7 @@ Fix the issue, run tests, commit, rebase on ${PRIMARY_BRANCH}, and push:
           _PR_WALK_EXIT_REASON="merged"
           return 0
         fi
-        if [ "$rc" -eq 2 ]; then
-          _PR_WALK_EXIT_REASON="merge_blocked"
-          return 1
-        fi
-        # Merge failed (conflict) — ask agent to rebase
+        # Merge failed (conflict or HTTP 405) — ask agent to rebase
         _prl_log "merge failed — invoking agent to rebase"
         agent_run --resume "$session_id" --worktree "$worktree" \
           "PR #${pr_num} approved but merge failed: ${_PR_MERGE_ERROR:-unknown}