openhands b4d14c4c98 fix: auto-rebase on merge conflict (mergeable=false) ... When merge returns non-200, check mergeable flag. If false, rebase the PR branch onto master via worktree. If rebase fails, spawn dev-agent to resolve. Prevents infinite 405 retry loops. Extracted try_merge_or_rebase() helper used at all 3 merge points.		2026-03-15 10:21:40 +00:00
..
dev-agent.sh	feat: add Matrix coordination channel, replace openclaw (Closes #8)	2026-03-14 16:25:33 +01:00
dev-poll.sh	fix: auto-rebase on merge conflict (mergeable=false)	2026-03-15 10:21:40 +00:00