Skip to content

πŸ› merge wording: fence note true for every no-auto-merge reason; one 090 manual-merge line - #18862

Merged
hivecommons-hive[bot] merged 2 commits into
hivecommons:v6from
Danathar:fix/merge-wording-followup
Nov 18, 2026
Merged

hivecommons-hive[bot] merged 2 commits into
hivecommons:v6from
Danathar:fix/merge-wording-followup

Conversation

@Danathar

Copy link
Copy Markdown
Contributor

Summary

A small follow-up to #18843. It merged before its last review round was addressed.

Two changes:

  • Fence comment wording: on a repo where hive auto-merge doesn't run, the note now reads "hive auto-merge does not run for this repository". The old wording was "auto-merge is off", which is wrong below L6 or with an invalid merge_strategy.
  • 090 manual-merge line: the closing line is built from one sentence, so the Prow and no-Prow variants can't drift apart.

The review findings and what happened to each

The hive's review of #18843 (re-review at 78036e7) left four findings:

  1. Fence comment gated on !repoAutoMergeAllowed; the reviewer suggested repoObservedOnly. That gate is kept on purpose. repoObservedOnly is false below L6 and with an invalid merge_strategy (automerge_sweep.go). The hive doesn't merge in those cases either, so the suggestion would bring back the false "the hive merges this PR itself" there. What the reviewer did catch is that the parenthetical only fit the switched-off case. It's reworded here.
  2. NoProw is read from the PR's labels. Not changed. v6 has no per-repo Prow signal to use instead. A Prow repo's plugins label a PR (size/*) within minutes of opening, long before it reaches 090.
  3. The wider 090 wording for all non-trust reasons. Not changed. That was deliberate in πŸ› 090 and workflow-fence comments: name auto-merge off, and no /lgtm without ProwΒ #18843, and its PR body says so.
  4. The duplicated no-Prow sentence (style). Done here.

Tests

automerge_stage_ready_wording_test.go now expects the new parenthetical. The existing 090 wording tests cover the manual-merge line, and its output is byte-identical.

Only gofmt -l was run locally (AGENTS.md bans local go test/go build/go vet). CI is the test run.

πŸ€– Generated with Claude Code

https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1

…0 manual-merge line

Follow-up to the hive review of hivecommons#18843 (merged before it was addressed):

- The fence comment is gated on !repoAutoMergeAllowed, which is also
  true below L6 and for an invalid merge_strategy, where the hive does
  not merge either. Keep that gate (repoObservedOnly would bring back
  "the hive merges this PR itself" below L6) and word the note so it is
  true in every case.
- Build the 090 manual-merge closing line once, so the Prow and no-Prow
  variants cannot drift.

Signed-off-by: Danathar <6772335+Danathar@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 18, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign kellyaa for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 18, 2026
@hivecommons-hive
hivecommons-hive Bot merged commit fdc3106 into hivecommons:v6 Nov 18, 2026
71 of 72 checks passed
@hivecommons-hive

hivecommons-hive Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Hive status β€” updated in place; edits do not notify. Full history is in the Activity Monitor.

Evidence bundle `#18862ce8cb62` sha256:ff21955e032ed28aec82a732da0cd98348f408da4fa8893aa423b25e05cf884e β€” download from the dashboard or `hivectl review evidence #18862`.

merged by Hive trusted-author auto-merge: author Danathar holds role owner and GitHub permission maintain on repo; CI green at ce8cb62.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant