Skip to content

release: reconcile production history with main #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wauputr4 merged 5 commits into from
Jul 20, 2026
Merged

release: reconcile production history with main #40

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6657920
chore: configure Cloudflare Workers assets (#36)
wauputr4 Jul 20, 2026
7b805f8
docs: align release promotion policy (#38)
wauputr4 Jul 20, 2026
34b13ba
docs: preserve release branch ancestry (#39)
wauputr4 Jul 20, 2026
ef1bb97
merge: reconcile release history
wauputr4 Jul 20, 2026
afa194a
Merge pull request #41 from IndopenSource/codex/reconcile-main-release
wauputr4 Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ Use `GITHUB_TOKEN` or `GH_TOKEN` to avoid low GitHub API rate limits.

The `release` branch is reserved for Cloudflare production deployments. Only
IndopenSource organization members may update it, through a pull request from
`main` that passes CI.
`main` that passes CI. Merge production promotion pull requests with a merge
commit so `main` remains in the `release` history.
Comment on lines +46 to +47

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 20, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Make this promotion a real merge commit

For this production promotion, the invariant documented here is not actually achieved: 800ec6f has only the single parent adc6f70, and the promoted main tip is still not an ancestor, so future main → release PRs will continue to include already-promoted changes instead of being clean promotions. Please redo this as an actual merge commit from main into release (or otherwise make main an ancestor) before relying on the release history.

Useful? React with 👍 / 👎.