Skip to content

Commit d8c8a12

Browse files
committed
docs: record algebraic typing merge
1 parent 90035b3 commit d8c8a12

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

BRANCHES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ all surfaced in the `gtf-new-pyshifty` merge.
8383
| 46 | `1dcdd53d` | `gtf-ontoenv` (clear closure copy/view guidance) | `4f1cd31e` | 1 | [#396](https://github.com/NatLabRockies/BuildingMOTIF/pull/396) open |
8484
| 47 | `bc92dd75` | `gtf-buildingmotif-skill` (repair and closure workflow guidance) | `61febb53` | 1 | not opened |
8585
| 48 | `d7b82e45` | `gtf-new-pyshifty` (library-backed manifest tutorial) | `505892fd` | 1 | [#399](https://github.com/NatLabRockies/BuildingMOTIF/pull/399) open |
86+
| 49 | `90035b32` | `gtf-new-pyshifty` (native algebraic type narrowing) | `6392b7af` | 1 | [#399](https://github.com/NatLabRockies/BuildingMOTIF/pull/399) open |
8687

8788
Merges 4 and 5 were made while the source-triples fix briefly lived on its own branch
8889
(`gtf-compile-source-triples`); that branch has since been folded into `gtf-new-pyshifty` by
@@ -92,7 +93,7 @@ either way. **All four feature branches are rooted at `develop`; none is stacked
9293
One commit remains only on this branch: `a60bf48f`. Its content is duplicated by `b757c342`
9394
on `gtf-new-pyshifty`, so nothing is lost if this branch is rebuilt.
9495

95-
**As of 2026-09-02, the tips recorded through merge #48 are included in
96+
**As of 2026-09-02, the tips recorded through merge #49 are included in
9697
`gtf-buildingmotif`.** The two documentation conflicts in merge #45 were resolved by taking the
9798
reviewed `gtf-new-pyshifty` versions, so there is no integration-only content to carry back.
9899
Re-check with `git merge-base --is-ancestor` before assuming this still holds: any later feature

0 commit comments

Comments
 (0)