diff --git a/changelog.d/fixed-merge-refused-review-change-request.md b/changelog.d/fixed-merge-refused-review-change-request.md new file mode 100644 index 0000000000..becca85de6 --- /dev/null +++ b/changelog.d/fixed-merge-refused-review-change-request.md @@ -0,0 +1 @@ +- Automerge: when GitHub refuses a merge for want of an approving review and a person's change request still stands on the PR, the `stage/085-needs-decision` comment now names the reviewer, the commit they reviewed and what the hive pushed since. It asks them to re-review, or a maintainer to dismiss the review, instead of asking anyone for an Approve over it (projectbluefin/utah-packages#633). PRs without a standing change request keep the same text. The self-authored sweep also re-reads `mergeable_state` right before the merge call and skips a head GitHub now calls conflicting, and a 405 "Pull Request has merge conflicts" from any lane is reported as `conflicting` instead of `merge-failed`. diff --git a/src/docs/labels-and-control-signals/stage-labels.md b/src/docs/labels-and-control-signals/stage-labels.md index 0a69f2bd43..a1f3c73d60 100644 --- a/src/docs/labels-and-control-signals/stage-labels.md +++ b/src/docs/labels-and-control-signals/stage-labels.md @@ -376,7 +376,7 @@ used to admit the PR: | CI red (required or optional) on a **fork** PR while **every** failing check's annotation says the check refuses forks (case-insensitive `fork pull request(s) cannot`, `maintainer must push this branch`, or `cannot publish` together with `fork` — a fork-publication / fork-secrets guard) | `085-needs-decision`, reason `fork-guard:,`: never 070/071/072, never nudged, never adopted (074) — neither the author nor the hive can turn the check green by pushing to the fork. The entry comment names the check and says a maintainer must push the branch to the repository (or approve the run as the repository requires). A same-repo PR with the same message, or a fork PR with any other red check, is handed back as usual ([#14273](https://github.com/hivecommons/hive/issues/14273)) | | any **non-required** check on the current head is red, whatever the lane's reason (the lane gates on required checks only, so it still soaks and merges; a reader of the rollup sees ✗). Parking modifiers (`hold`, `needs-human`, admission reasons) still win | `070-fixing` / `071-needs-author` / `072-returned-to-contributor` (by author kind), reason `optional-check-failing:` (the nudge lists every red check); never 080 or 100. A red *required* check is the lane's own `required-check-failing:*` → 070/071/072 ([#12538](https://github.com/hivecommons/hive/issues/12538), seen on [#12457](https://github.com/hivecommons/hive/pull/12457)) | | `label:hold`, `held`, `label:needs-human`, `exempt-label`, `excluded-label:*`, `sentinel`, `human-merge-path*`, `intent-*`, `contributor-lane:workflow-path` / `tests-removed` / `no-reviewer` / `reporter-trust-hold`, `workflow-permission` (GitHub refused update-branch or the merge-forward with a 403 because the base changed `.github/workflows/` and the token the hive used lacks the workflows permission; no token the hive holds can push that update, so it is not sent to 070), `fork-workflow-update` (the same update-branch refusal on a fork head: the App is not installed on the fork, so no grant lets it push there), `linked-issue:hold:#N: