Reconcile stable master into dev #88

Closed
lost-rob0t wants to merge 0 commits from master into dev
lost-rob0t commented 2026-07-31 18:56:25 +00:00 (Migrated from github.com)

Goal

Restore the repository branch policy after recent work landed on master while dev continued independently.

  • dev remains the integration branch.
  • master remains the stable branch.
  • This PR brings the 31 commits currently unique to master back into dev while retaining the 10 operational-salvage commits unique to dev.

Why this must land first

Open PRs #79 and #86 were retargeted to dev and currently conflict because the base branches have diverged. PR #87 was already merged into master; this reconciliation carries that database-repair work into dev without dropping the operational runtime already present there.

Merge gate

  • resolve overlaps without dropping either authorization/schema/dedup work or operational-salvage behavior
  • run schema lock, unit, integration, smoke, and container-stack checks on the merged tree
  • merge only when required checks are green

After this lands, re-evaluate #79 and #86 against the synchronized dev base.

## Goal Restore the repository branch policy after recent work landed on `master` while `dev` continued independently. - `dev` remains the integration branch. - `master` remains the stable branch. - This PR brings the 31 commits currently unique to `master` back into `dev` while retaining the 10 operational-salvage commits unique to `dev`. ## Why this must land first Open PRs #79 and #86 were retargeted to `dev` and currently conflict because the base branches have diverged. PR #87 was already merged into `master`; this reconciliation carries that database-repair work into `dev` without dropping the operational runtime already present there. ## Merge gate - resolve overlaps without dropping either authorization/schema/dedup work or operational-salvage behavior - run schema lock, unit, integration, smoke, and container-stack checks on the merged tree - merge only when required checks are green After this lands, re-evaluate #79 and #86 against the synchronized `dev` base.
nsaspy changed title from WIP: Reconcile stable master into dev to Reconcile stable master into dev 2026-08-28 03:29:43 +00:00

Pull request closed

Sign in to join this conversation.
No description provided.