promote: dev → main (vps1/vps2 estate split) #106

Merged

admin_emi merged 2 commits from dev into main

2026-07-26 07:07:29 +00:00

admin_emi commented

2026-07-26 07:02:30 +00:00

Owner

Promotes dev → main, deploying to beta (beta.thermograph.org).

Who merges. Centralis, once the required check is green — under the promotion policy main is the agent's call, and a promotion PR left open is worse than one never opened.

Divergence. 1 ahead, 5 behind. 1 commit(s) to carry, but the target has moved on by 5 — a merge commit is required and conflicts are possible
Not fast-forwardable: the target holds 5 commit(s) the source does not. That is the accumulated design of this release chain, not a mistake anyone just made — every promotion merges the source into the target, which creates a merge commit ON THE TARGET that the source never receives, so each promotion widens the gap it just closed. Expect --ff-only to fail with "diverging branches"; the promotion is a merge commit.

Predicted conflicts.

.forgejo/workflows/deploy.yml — edited on both sides
CLAUDE.md — edited on both sides
CUTOVER-NOTES.md — edited on both sides
README.md — edited on both sides
docs/onboarding/01-orientation.md — edited on both sides
docs/onboarding/02-setup.md — edited on both sides
docs/onboarding/03-repo-map.md — edited on both sides
docs/onboarding/04-backend.md — edited on both sides
docs/onboarding/05-frontend.md — edited on both sides
docs/onboarding/07-ci-and-release.md — edited on both sides
docs/onboarding/08-infra-secrets.md — edited on both sides
docs/onboarding/09-observability.md — edited on both sides
docs/onboarding/10-recipes.md — edited on both sides
docs/onboarding/11-traps.md — edited on both sides
docs/onboarding/README.md — edited on both sides
infra/deploy/forgejo/README.md — edited on both sides
observability/grafana/provisioning/alerting/contact-points.yml — edited on both sides
observability/grafana/provisioning/alerting/rules-prod.yml — edited on both sides

Commits (1).

d138f00a infra: split the estate into vps1/vps2 — beta joins prod, dev gets a home (#103)

Merge with a merge commit, not a squash or a fast-forward. main runs ahead of dev from earlier promotions, so --ff-only fails with "diverging branches", and squashing would rewrite the shared history so the next promotion sees every prior commit as new. (Making promotions fast-forward-only is an open question, not current policy — it needs a one-time history reconciliation on the protected branches first.)

Promotes `dev` → `main`, deploying to beta (beta.thermograph.org). **Who merges.** Centralis, once the required check is green — under the promotion policy `main` is the agent's call, and a promotion PR left open is worse than one never opened. **Divergence.** 1 ahead, 5 behind. 1 commit(s) to carry, but the target has moved on by 5 — a merge commit is required and conflicts are possible Not fast-forwardable: the target holds 5 commit(s) the source does not. That is the accumulated design of this release chain, not a mistake anyone just made — every promotion merges the source into the target, which creates a merge commit ON THE TARGET that the source never receives, so each promotion widens the gap it just closed. Expect `--ff-only` to fail with "diverging branches"; the promotion is a merge commit. **Predicted conflicts.** - `.forgejo/workflows/deploy.yml` — edited on both sides - `CLAUDE.md` — edited on both sides - `CUTOVER-NOTES.md` — edited on both sides - `README.md` — edited on both sides - `docs/onboarding/01-orientation.md` — edited on both sides - `docs/onboarding/02-setup.md` — edited on both sides - `docs/onboarding/03-repo-map.md` — edited on both sides - `docs/onboarding/04-backend.md` — edited on both sides - `docs/onboarding/05-frontend.md` — edited on both sides - `docs/onboarding/07-ci-and-release.md` — edited on both sides - `docs/onboarding/08-infra-secrets.md` — edited on both sides - `docs/onboarding/09-observability.md` — edited on both sides - `docs/onboarding/10-recipes.md` — edited on both sides - `docs/onboarding/11-traps.md` — edited on both sides - `docs/onboarding/README.md` — edited on both sides - `infra/deploy/forgejo/README.md` — edited on both sides - `observability/grafana/provisioning/alerting/contact-points.yml` — edited on both sides - `observability/grafana/provisioning/alerting/rules-prod.yml` — edited on both sides **Commits (1).** - d138f00a infra: split the estate into vps1/vps2 — beta joins prod, dev gets a home (#103) **Merge with a merge commit, not a squash or a fast-forward.** `main` runs ahead of `dev` from earlier promotions, so `--ff-only` fails with "diverging branches", and squashing would rewrite the shared history so the next promotion sees every prior commit as new. (Making promotions fast-forward-only is an open question, not current policy — it needs a one-time history reconciliation on the protected branches first.)

admin_emi added 1 commit 2026-07-26 07:02:31 +00:00