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

Merge 24.0.1 hotfix into release/24.1 #22438

Merged
merged 8 commits into from
Jan 24, 2024

Conversation

spencertransier
Copy link
Contributor

This PR merges the changes from the 24.0.1 hotfix into release/24.1. Includes:

@peril-wordpress-mobile
Copy link

Messages
📖 This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jan 23, 2024

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr22438-63a052d
Version24.1
Bundle IDorg.wordpress.alpha
Commit63a052d
App Center BuildWPiOS - One-Offs #8524
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jan 23, 2024

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr22438-63a052d
Version24.1
Bundle IDcom.jetpack.alpha
Commit63a052d
App Center Buildjetpack-installable-builds #7547
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@mokagio mokagio changed the base branch from trunk to release/24.1 January 23, 2024 08:09
@mokagio
Copy link
Contributor

mokagio commented Jan 23, 2024

@spencertransier, given the PR title, I took the liberty to update the base branch from trunk to release/24.1. However, there are still merge conflicts 🤔

@spencertransier
Copy link
Contributor Author

@mokagio I had started working on those merge conflicts when I realized that there will need to be a new version of Gutenberg that includes the hotfix as well. So I thought it made sense to wait until that is released (see p1705991079495289/1705947847.142679-slack-CC7L49W13) before finishing the merge conflicts since the first two are related to the Gutenberg version.

How would you normally handle a situation like this?

@spencertransier spencertransier merged commit 9c15777 into release/24.1 Jan 24, 2024
22 checks passed
@spencertransier spencertransier deleted the merge/24.0.1-into-release-24.1 branch January 24, 2024 01:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants