Current state — supersedes the obsolete Git Flow plan
The former long-lived dev/master split was retired on August 16, 2026.
Final audited pre-reconciliation state:
- master:
e2fa1991d8b08b74bcb2194c7a10f02da2431ad1
- dev:
6d2feb103e57f2227b3609430ae7c68e7e834aa1
- merge base:
e9586b935758dbae69283e6a099e30cdb29a5ba9
- dev was 78 commits ahead and 21 behind master
PR #99 performed the final semantic dev -> master reconciliation without rewriting either published history. It merged as 516742d1de433a79fe1921b1b8b1ac00e6599e2a after Smoke Tests, Container Stack, canonical schema lock, and operational-salvage gates were green.
Canonical branch policy
master is the only long-lived canonical development branch.
Every new short-lived branch starts from current master:
feature/<issue>-<slug>
fix/<issue>-<slug>
research/<slug>
hotfix/<issue>-<slug>
Every normal pull request targets master.
The dev branch is retired/deprecated. Never create new work from it, never target new pull requests at it, and do not recreate a permanent integration branch.
Historical dev PR disposition
Acceptance criteria
Close this issue after the checked-in branch-policy PR is merged and historical dev-targeting PRs have explicit dispositions.
Current state — supersedes the obsolete Git Flow plan
The former long-lived
dev/mastersplit was retired on August 16, 2026.Final audited pre-reconciliation state:
e2fa1991d8b08b74bcb2194c7a10f02da2431ad16d2feb103e57f2227b3609430ae7c68e7e834aa1e9586b935758dbae69283e6a099e30cdb29a5ba9PR #99 performed the final semantic
dev -> masterreconciliation without rewriting either published history. It merged as516742d1de433a79fe1921b1b8b1ac00e6599e2aafter Smoke Tests, Container Stack, canonical schema lock, and operational-salvage gates were green.Canonical branch policy
masteris the only long-lived canonical development branch.Every new short-lived branch starts from current
master:feature/<issue>-<slug>fix/<issue>-<slug>research/<slug>hotfix/<issue>-<slug>Every normal pull request targets
master.The
devbranch is retired/deprecated. Never create new work from it, never target new pull requests at it, and do not recreate a permanent integration branch.Historical dev PR disposition
Acceptance criteria
Close this issue after the checked-in branch-policy PR is merged and historical dev-targeting PRs have explicit dispositions.