promote: dev → main (sign in with Discord) #116

Merged

admin_emi merged 1 commit from dev into main

2026-07-26 18:22:04 +00:00

admin_emi commented

2026-07-26 18:19:58 +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, 9 behind. 1 commit(s) to carry, but the target has moved on by 9 — a merge commit is required and conflicts are possible
Not fast-forwardable: the target holds 9 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.

infra/deploy/thermograph.env.example — edited on both sides

Commits (1).

8572c4aa accounts: sign in with Discord, sharing the existing link callback (#115)

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, 9 behind. 1 commit(s) to carry, but the target has moved on by 9 — a merge commit is required and conflicts are possible Not fast-forwardable: the target holds 9 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.** - `infra/deploy/thermograph.env.example` — edited on both sides **Commits (1).** - 8572c4aa accounts: sign in with Discord, sharing the existing link callback (#115) **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 18:20:00 +00:00