Commit Graph

1 Commits

Author SHA1 Message Date
ruv dc20c87a68 docs(adr-110): branch-state map for ADR-110 ↔ ADR-115 coordination
Iter 22 — defensive ultra-opt after iter 17-19 burned ~30 minutes
recovering from cross-branch checkouts. Reference card so the next
collaborator (or the next /loop) doesn't have to re-derive the layout
from git log.

Captures:
  * Branch ownership table (who owns adr-110-esp32c6 vs
    feat/adr-115-ha-mqtt-matter, what each carries, what to NOT merge)
  * File-level region map for the two shared files
    (Cargo.toml + sensing-server/src/main.rs) — the regions are
    DISJOINT so merges should be clean line-merge with no conflicts
  * Quick verification commands for either branch
  * Recovery procedure pointer to iter 18 commit 2997165bc message

Verification baseline pinned in the doc: full v2 cargo workspace test
suite at 1437 tests, 0 failures (iter 22 measurement). Anyone running
that locally and seeing the same number knows the branch is sane.

Co-Authored-By: claude-flow <ruv@ruv.net>
2026-05-23 13:58:08 -04:00