Skip to content

release: dev -> master - #16

Merged
xormania merged 3 commits into
masterfrom
release/dev-into-master
Sep 2, 2026
Merged

release: dev -> master#16
xormania merged 3 commits into
masterfrom
release/dev-into-master

Conversation

@xor-machine

Copy link
Copy Markdown
Contributor

Release: dev merged into master, conflicts resolved to dev. Earlier rebase releases left master with copies of dev commits, so a plain merge conflicts on files changed since; the resulting tree is identical to dev. Needs a merge commit: linear history off on master.

🤖 Generated with Claude Code

https://claude.ai/code/session_012Jj94rkp3tfHAxUkTCthgY

Apply Push Bridge and others added 3 commits September 2, 2026 18:26
Workflows name master where they named main, and CODEOWNERS makes
the release branch the owner's to approve.

Source: original
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012Jj94rkp3tfHAxUkTCthgY
Apply-Push-Job: 20260902T222644Z-apply-push-2fb0a6
Patch-SHA256: 98553f3ff86cad91d65165aa1235e23c5b6900164f61422431943de747d86069
repo: master is the release branch
@xormania
xormania marked this pull request as ready for review September 2, 2026 22:38
@xormania
xormania merged commit f51210e into master Sep 2, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants