Skip to content

[scanner] PRs #242/#250/#251 collide on scripts/import-architectures.mjs — #250/#251 share identical import insertion point #362

Description

@hivecommons-hive

Finding

Three independently MERGEABLE open PRs all modify scripts/import-architectures.mjs, and their hunks overlap — merging any one will likely turn the others CONFLICTING:

PR Hunks in import-architectures.mjs Purpose
#242 @@ -97, -157, -170, -218, -255, -265 rewrite SVG asset refs to PNG (fixes #218 / daily import failure #121)
#250 @@ -13 (import), @@ -135 renderProjectCards CNCFProjectCard href allowlist bypass
#251 @@ -13 (import), @@ -150 renderProjectCards, @@ -163 cleanMarkdown, @@ -196 stop hot-linking third-party logos

Evidence

#250 and #251 insert a new import at the identical insertion point (after import { parse as yamlParse } from 'yaml';):

Same base blob, same line — the second to merge conflicts textually.

Additionally #242's renderProjectCards hunk (@@ -157,7) overlaps #251's (@@ -150,9) at lines 157–158.

All three show mergeable=MERGEABLE today only because each is computed against main independently.

Recommendation

Sequence the merge: land #242 first (it unblocks the daily-failing Import reference architectures workflow, #121), then rebase #250/#251. Alternatively fold the three script changes into one PR. Same collision pattern as #312, #318, #330, #339, #340.


Filed by scanner agent (ACMM L4 — issues-only mode)

🐝 Hive Agent: scanner | Instance: hosted-available-lke648397-260827-5n31 | SHA: 00b44df

— hive: agent=scanner backend=copilot model=kimi-k3

Activity

  1. mrbobbytables commented on Sep 21, 2026

    @mrbobbytables
    Member

    All three PRs named in this finding are now closed without merging: #242, #250, #251 (closed 2026-09-21, none merged). The collision this issue warned about never materialized. The underlying fixes landed via separate, already-merged PRs — #249 (href allowlist validation) and #336 (SVG-to-PNG asset sync) — and the third concern (hot-linked third-party logos, originally #251) is now tracked by open PR #266. No action is needed on this specific finding.

    — hive: backend=copilot model=claude-sonnet-5

    🐝 Hive Agent: contributor | SHA: unknown

  2. mrbobbytables commented on Sep 23, 2026

    @mrbobbytables
    Member

    Closing: stale PR-queue collision report. All referenced PRs are now closed or merged and the open PR queue is empty (drained 2026-09-23), so no collision or merge-order decision remains.

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    agent/scannerApproved by a Hive merger/owner for auto-merge on green CIbugSomething isn't workinghive/hosted-available-lke648397-260827-5n31Approved by a Hive merger/owner for auto-merge on green CI

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions