Review backlog (style): Forward-merge conflict expected with #14401 (merged to v6) on the same block

Blocked on PR #14535. This finding came from reviewing PR #14535 and is about code that PR is changing. Fix it in the PR, or leave it: the hive lifts the block when the PR merges, and unblocks this item for re-triage if the PR is closed without merging. Once it is unblocked, check the finding still applies on the base branch; if it is already fixed, close this item without a PR.

Filed from an out-of-scope finding in the Hive review of PR #14535.

PR: #14535 (#14535)
Perspective: style
Severity: info (P3)
Evidence: src/cmd/hive/main_helpers.go:317 (

hive/src/cmd/hive/main_helpers.go

Line 317 in d17fe50

if !holdguard.IsHygieneMerge(commits[len(commits)-1], pr.HeadSHA, pr.BaseSHA) {

)
Finding: Forward-merge conflict expected with #14401 (merged to v6) on the same block

#14401 merged to v6 on 2026-10-27 and rewrote maintainHeldPRMergeability (main_helpers.go) and holdguard.go (SettleUpdateRequest). This v5 PR edits the same region (main_helpers.go:317-326, holdguard.go IsHygieneMerge). Sequencing is the hive's call; noting so the v5->v6 forward-merge is done by hand and IsHygieneMerge is wired into the v6 settle path too.

Fingerprint: 8523b667c742d0ebadea0dfe70f19144ea930ae613c89a6547f44959ebbe8313

filed by Hive review backlog

Unblocked: #14535 is no longer open. This issue is actionable again.

Unblocked: #14535 merged. This item is actionable now; check the finding still applies on the base branch first, and close it without a PR if it is already fixed.

@thatguywob

🔒 Claimed by @thatguywob (contributor on hive hosted-available-oke-11-placeholder-r05x). The claim lasts 30m0s without activity and renews while the work continues. Reply /unclaim to release, or /claim to take it over if you outrank the holder.

🔒 Claimed by agent scanner (agent on hive hosted-available-oke-11-placeholder-r05x). The claim lasts 2h0m0s without activity and renews while the work continues. Reply /unclaim to release, or /claim to take it over if you outrank the holder.

🐛 fix(holdguard): forward-port the hygiene-merge baseline guard to v6 (…

Closed by #14564 (merged to v6).

Navigation Menu

Review backlog (style): Forward-merge conflict expected with #14401 (merged to v6) on the same block #14539

5 remaining items

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Review backlog (style): Forward-merge conflict expected with #14401 (merged to v6) on the same block #14539

Description

Activity

hivecommons-hive commented on Oct 27, 2026

hivecommons-hive commented on Oct 27, 2026

hivecommons-hive commented on Oct 27, 2026

5 remaining items

hivecommons-hive commented on Oct 27, 2026

github-actions commented on Oct 27, 2026

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions