Skip to content
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.

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

chore(release): v55 release to main correction #807

Merged
merged 1 commit into from
Oct 7, 2024
Merged

chore(release): v55 release to main correction #807

merged 1 commit into from
Oct 7, 2024

Conversation

y3rsh
Copy link
Collaborator

@y3rsh y3rsh commented Oct 4, 2024

Overview

Note this does not affect 8.1.0. v55 is the tag for 8.0.0 and 8.1.0.

My first v55 merge back from release to main was not using release and/or main in the correct state. Obviously I thought I was in the correct state. The change looked correct in terms of content but it was not. I did not notice until Friday 10/4/2024 when I saw that v55 tag was not in main.

The change in this is identical to #806 and #802

We need to actually merge release to main correctly, otherwise we will have an issue next release cycle (from main create chore_release-8.2.0 merge --ff-only to release merge back to main .)

Current main

image

After merge release

image

@y3rsh y3rsh self-assigned this Oct 4, 2024
@y3rsh y3rsh requested a review from vegano1 October 4, 2024 15:48
@y3rsh y3rsh merged commit f7d5bbf into main Oct 7, 2024
58 of 61 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