Skip to content

Conversation

@mladedav
Copy link
Collaborator

I've tried to cherry pick anything that was in the changelog and then whatever started with axum-extra: in the commit message.

I then just merged main back into this keeping the version update in Cargo.toml and the changelog for 0.12.

I hope I didn't miss anything (though I wouldn't be surprised if I did) and if I should do something else than the merge back, I can change this.

@mladedav mladedav force-pushed the dm/axum-extra-0-12-0 branch from 43c19d1 to fa2653a Compare October 29, 2025 16:01
@mladedav mladedav force-pushed the dm/axum-extra-0-12-0 branch from fa2653a to 24958ac Compare October 29, 2025 16:09
@jplatte
Copy link
Member

jplatte commented Oct 31, 2025

Okay, so I've done the release. For the merge back to main, I usually do it the other way around (not sure whether there is any difference other than the order of the parents of the merge commit + how the default commit message mentions them). Probably doesn't matter.

What does matter though is that I don't want to merge a merge commit, so would you mind redoing the merge against the latest main, and once CI passes fast-forward main to it? (even though the web UI doesn't allow you to fast-forward merge a PR, PR-based branch restrictions can be met when pushing from the command line - GitHub looks for a matching PR that has the commit you're trying to push as its head and checks the conditions based on that)

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.

7 participants