Commit 5ab5ae3
Merge branch 'master' into trinity-rust-rings for W403 (Closes #1307)
Resolves conflicts in:
- .trinity/current-issue.md (keep W403 issue #1307)
- .trinity/experience.md (keep W403 learnings + prior waves)
- docs/NOW.md (keep W403 entry + prior waves)
- fpga/HARDWARE_SSOT.md (keep W402 + W403 formal traceability)
- proofs/lean4/Trinity/TernaryFPGABoot.lean (keep W402 base + W403
BitstreamConfig/ColdPOR/linkage lemmas)
Post-merge verification:
- lake build Trinity.TernaryFPGABoot ✅
- ./scripts/tri test 576/576 PASS
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>1 file changed
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1360 | 1360 | | |
1361 | 1361 | | |
1362 | 1362 | | |
| 1363 | + | |
| 1364 | + | |
| 1365 | + | |
| 1366 | + | |
0 commit comments