Skip to content

chore: back-merge release/v0.1.12 into develop#67

Merged
explosivebit merged 3 commits into
developfrom
chore/back-merge-v0.1.12
May 6, 2026
Merged

chore: back-merge release/v0.1.12 into develop#67
explosivebit merged 3 commits into
developfrom
chore/back-merge-v0.1.12

Conversation

@explosivebit
Copy link
Copy Markdown
Contributor

Summary

Standard back-merge of release/v0.1.12 into develop per the project's GitFlow:

  • Brings the version bump (0.1.11 → 0.1.12) and the new [0.1.12] - 2026-05-07 CHANGELOG section back onto develop, so the next feature branch starts from the released version, not the pre-release one.
  • 3 files changed (CHANGELOG.md, package.json, template/package.json).
  • No code conflicts — the merge is a forward-port of the version commit only; all feature commits in v0.1.12 already came from develop.

Why

Without back-merge, develop's package.json would stay at 0.1.11 while npm + main are at 0.1.12. The next release branch would either:

  • silently inherit 0.1.11 and we'd have to bump again, or
  • conflict on the next merge to main.

Test plan

  • git diff origin/develop..origin/release/v0.1.12 --stat — only version + CHANGELOG entries
  • CI matrix on this PR (auto)

🤖 Generated with Claude Code

@explosivebit explosivebit enabled auto-merge May 6, 2026 22:01
@explosivebit explosivebit merged commit 8557fee into develop May 6, 2026
5 of 6 checks passed
@explosivebit explosivebit deleted the chore/back-merge-v0.1.12 branch May 6, 2026 22:08
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.

1 participant