Repository navigation
π merge wording: fence note true for every no-auto-merge reason; one 090 manual-merge line - #18862
Merged
hivecommons-hive[bot] merged 2 commits intoNov 18, 2026
Conversation
β¦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
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
A small follow-up to #18843. It merged before its last review round was addressed.
Two changes:
merge_strategy.The review findings and what happened to each
The hive's review of #18843 (re-review at
78036e7) left four findings:!repoAutoMergeAllowed; the reviewer suggestedrepoObservedOnly. That gate is kept on purpose.repoObservedOnlyis false below L6 and with an invalidmerge_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.size/*) within minutes of opening, long before it reaches 090.Tests
automerge_stage_ready_wording_test.gonow expects the new parenthetical. The existing 090 wording tests cover the manual-merge line, and its output is byte-identical.Only
gofmt -lwas run locally (AGENTS.md bans localgo test/go build/go vet). CI is the test run.π€ Generated with Claude Code
https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1