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
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:Evidence
#250and#251insert a new import at the identical insertion point (afterimport { parse as yamlParse } from 'yaml';):+import { isCncfProjectHref } from './lib/project-card-links.mjs';+import { projectAsset } from './lib/project-asset.mjs';Same base blob, same line — the second to merge conflicts textually.
Additionally #242's
renderProjectCardshunk (@@ -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 architecturesworkflow, #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