Overview
| Comment: | Merge landing-record |
|---|---|
| Timelines: | family | ancestors | descendants | both | landing-propose |
| Files: | files | file ages | folders |
| SHA3-256: |
a1ac8de35eaaf5f22ec5f80b80ef5eb8 |
| User & Date: | dmestas on 2026-10-25 16:51:20.727 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-25
| ||
| 17:12 |
land landing-propose
Checks tested the merge with trunk at 5116d453155b; trunk has moved since. check-in: 7c1db1744c user: dmestas tags: trunk | |
| 16:51 | Merge landing-record closed check-in: a1ac8de35e user: dmestas tags: landing-propose | |
| 16:48 | Merge landing-resolve; harness tests read the strip and the new rung rows closed check-in: 5116d45315 user: dmestas tags: landing-record | |
| 16:23 | Create new branch named "landing-propose" check-in: c399d75bc6 user: dmestas tags: landing-propose | |
Changes
Modified internal/harness/landing_conflict_test.go
from [e5cec1629d]
to [79ad8cb20e].
[diff]
Modified internal/harness/strata_preflight_test.go
from [cc02d9b5b0]
to [2f509b2c65].
[diff]