chore: merge main (v1.7.0) back into beta#99
Merged
Merged
Conversation
release: promote EPIC-01 (Authentication & User Management) to stable
4 tasks
Contributor
|
🎉 This PR is included in version 1.8.0-beta.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Contributor
|
🎉 This PR is included in version 1.8.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges main back into beta so the
v1.7.0tag (commitcaee52f) becomes reachable from beta's history.Problem: After epic promotion (beta → main), semantic-release on beta cannot see the
v1.7.0tag because the merge commit only exists on main. This causes beta to keep producingv1.7.0-beta.Xinstead ofv1.8.0-beta.1.Fix: A merge commit from main into beta makes
caee52fan ancestor of beta, sogit tag --merged betaincludesv1.7.0.Test plan
git merge-base --is-ancestor caee52f betareturns success after mergegit tag --merged beta | grep v1.7.0shows the tagfeat:commit on beta should producev1.8.0-beta.1🤖 Generated with Claude Code