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

End of year 2024 break #668

Merged
merged 2 commits into from
Dec 21, 2024
Merged

End of year 2024 break #668

merged 2 commits into from
Dec 21, 2024

Conversation

yuxizama
Copy link
Collaborator

Indeed to show the block on the frontend, we should merge it into 0.6 branch.
(It's ok to merge doc changes into release branch, that's what we do each time for release also) @bcm-at-zama

Copy link
Contributor

@bcm-at-zama bcm-at-zama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved

@bcm-at-zama
Copy link
Contributor

not sure what's the commit e69cbd8 here

@immortal-tofu
Copy link
Collaborator

immortal-tofu commented Dec 21, 2024

not sure what's the commit e69cbd8 here
Because you try to merge your branch coming from master to release/0.6.x
The best way is to start from release/0.6.x (and cherry pick commits if needed)

Since JAT did exactly the same mistake and merged the whole main branch in release/0.6.x, you only add the merge commit by doing the same mistake.

Let's merge it as it is.

@immortal-tofu immortal-tofu merged commit c2f7c05 into release/0.6.x Dec 21, 2024
7 checks passed
@immortal-tofu immortal-tofu deleted the end_of_year_2024_break branch December 21, 2024 00:45
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.

4 participants