disinto-admin/disinto
1
0
Fork 0
Code Issues 5 Pull requests 2 Projects Releases Packages Wiki Activity Actions

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
Conversation 2 Commits 1 Files changed 1 +1 -5
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pr-lifecycle.sh
View file

@ -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}