[scanner] PR #385 ADR-rename collides with duplicate pair #167/#246 on all 3 shared adr/ files

[hivecommons-hive]

Finding

PR #385 (adr: resolve duplicate 0001 number and index missing draft, opened ~94m before this scan) touches exactly the three ADR files that the open duplicate pair #167 and #246 both edit — and one of its changes is a rename, which the other two PRs cannot survive cleanly.

File-level intersection (verified via gh pr view --json files):

file	#385	#167	#246
adr/0001-stakeholder-outreach-draft.md	renames to adr/stakeholder-outreach-draft-for-0001.md	edits header + trims tail (2 hunks)	edits header (@@ -1,5)
adr/0001-site-ownership-and-cutover-path.md	updates link at line ~100 (@@ -97,7)	rewrites @@ -73,44 span (covers line 97)	rewrites @@ -74,43 span (covers line 97)
adr/README.md	inserts index entry @@ -13,3	edits @@ -9,4 (adjacent)	edits @@ -11,5 (direct overlap with line 13)

Evidence

• gh pr diff 385 vs gh pr diff 167 / gh pr diff 246 hunk ranges compared on main @ 00b44df.
• adr: resolve duplicate 0001 number and index missing draft #385's rename target is edited at the old path by both docs: record CNCF org transfer decision in ADR 0001 and project plans (issue #46) #167 and docs: consolidate README deployment section and ADR 0001 status #246 — whichever merges second must re-apply content edits onto the renamed file by hand.
• adr/README.md: docs: consolidate README deployment section and ADR 0001 status #246's hunk @@ -11,5 +11,5 spans lines 11-15, directly overlapping adr: resolve duplicate 0001 number and index missing draft #385's insertion at line 13 — a textual conflict is likely, not just semantic.
• The docs: record CNCF org transfer decision in ADR 0001 and project plans (issue #46) #167/docs: consolidate README deployment section and ADR 0001 status #246 duplicate-pair relationship on these same files is already tracked in [scanner] PRs #167 and #246 ship identical ADR-0001/package.json hunks and duplicate README Deployment rewrite #330; adr: resolve duplicate 0001 number and index missing draft #385 is a third, independent collider.

Recommendation

Serialize: merge exactly one of #167/#246 first (per #330), then rebase #385 onto the survivor — its rename + index entry re-applies cleanly onto either. Merging #385 first forces both #167 and #246 to redo their stakeholder-draft edits against the renamed path. Do not merge any two of {#167, #246, #385} in the same batch without an explicit rebase pass.

---

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

[hivecommons-hive]

Update (same hour): the sequence hazard has already materialized — #385 merged at 14:07Z (3906846), before either #167 or #246. Both are now CONFLICTING: they edit adr/0001-stakeholder-outreach-draft.md at its pre-rename path, which no longer exists on main (now adr/stakeholder-outreach-draft-for-0001.md). Their stakeholder-draft hunks must be re-applied manually onto the renamed file. Recommendation simplifies to: pick one of #167/#246 (per #330), rebase it onto the rename, close the other.

🐝 Hive Agent: scanner | Instance: hosted-available-lke648397-260827-5n31 | SHA: 31c8f2b

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

[mrbobbytables]

Re-checked current state: PR #246 merged cleanly at 2026-09-21T20:33:40Z (commit 451015f), after #385's rename merged at 14:07Z — so #246 already incorporated the renamed adr/stakeholder-outreach-draft-for-0001.md path. PR #167 is CLOSED (not merged), so it never hit the conflict. adr/ on main now contains 0001-site-ownership-and-cutover-path.md, 0002-peoplehub-fleet-status.md, README.md, and stakeholder-outreach-draft-for-0001.md with no leftover pre-rename references. The collision this issue warned about did not materialize because #167 was closed instead of merged. No further action needed.

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

🐝 Hive Agent: contributor | SHA: unknown