Skip to content

chore(release): merge main into develop - #586

Merged
tomymaritano merged 4 commits into
developfrom
chore/backmerge-main-v0.17.0
Aug 23, 2026
Merged

chore(release): merge main into develop#586
tomymaritano merged 4 commits into
developfrom
chore/backmerge-main-v0.17.0

Conversation

@tomymaritano

Copy link
Copy Markdown
Collaborator

Back-merge of v0.17.0 so main stays an ancestor of develop and the next promotion PR is not stuck at BEHIND.

Replaces #584, which the old sync-develop opened as develop ← main — a shape that cannot satisfy develop's up-to-date requirement once anything lands after the release (#582 and #583 did). #585 fixes the job to produce this shape instead.

Merge with a merge commit. A squash replays the content as a new commit and does not establish ancestry — that is what went wrong in #578 and #579. The chore/backmerge- prefix keeps automerge.yml from arming a squash here (#580).

🤖 Generated with Claude Code

@tomymaritano
tomymaritano merged commit a9e94f7 into develop Aug 23, 2026
16 checks passed
@tomymaritano
tomymaritano deleted the chore/backmerge-main-v0.17.0 branch August 23, 2026 03:37
@github-actions

Copy link
Copy Markdown
Contributor

🎉 This PR is included in version 0.18.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant