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

next to master #230

Merged
merged 53 commits into from
Dec 17, 2024
Merged

next to master #230

merged 53 commits into from
Dec 17, 2024

Conversation

mhewson
Copy link
Member

@mhewson mhewson commented Dec 11, 2024

It looks like we may have been forgetting to merge next into master during release process - anything in here that should not be?

@sikhote
Copy link
Contributor

sikhote commented Dec 12, 2024

Ah I think there were a couple quick releases where I left that step out by accident.

I can make sure we do that in the next release for tokens (or whoever goes through the process). I'd suggest we perform the merge here after a release, rather than right now. The reason being, if we merged intro master now, some of the unreleased changes here would end up in master and it's too difficult to cherry pick those changes that are released. Overall, it wouldn't be a big deal either way.

@c4rlosviteri c4rlosviteri merged commit b7ec479 into master Dec 17, 2024
1 check failed
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