mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
Two completion-stranding fixes, reimplemented on current master from CoreyRDean's #120 and #121: - merge_pull_request: on a 405 (repo disallows the requested merge method — e.g. squash merges turned off in repo settings), look up a permitted method (_first_allowed_merge_method, preferring squash > merge > rebase) and retry once. A repo's merge-button config can no longer permanently wedge the PM on an open, mergeable PR. No behavior change when the requested method is allowed. - create_pull_request: if the resolved PR base branch is missing on origin (an ancestor task claimed but never pushed -> GitHub 422 "base field invalid"), ls-remote the base and retarget to the project default branch (_pr_base_on_remote), mirroring the existing create_branch fallback. No behavior change when the base exists. Both funnel through the central git paths so every caller benefits. Adds unit tests for both fallbacks.