Skip to content

Conversation

crazytonyli
Copy link
Contributor

@crazytonyli crazytonyli commented Oct 10, 2025

Description

I messed up the release 26.4 when I picked up the 26.4 release a few days ago. Here is what happened:

The release branch is already merged into trunk: #24911. But I did not see that PR, and created another one: #24915. What's worse is that I merged the trunk branch into the release branch to solve merge conflicts. That means we have commits that are not intended to be released in the release branch. Also, the Localizable.strings files used by the translation process are changed after that merge.

Here is the commit that merged the trunk branch into the release branch: 74afbd0. From the commit, you can see the trunk commit was 808aafc.

Using this command, we can see the merged changes are 808aafc e5076c9.

$ git log `git merge-base 808aafcbc769dc44cccb183939ac229c56e1198d 61ef3bd20b0ee283103121a010bd84fbdb8865d9`..808aafcbc769dc44cccb183939ac229c56e1198d

808aafcbc7 Remove .newPublishingSheet FF (#24912)
e5076c9085 Remove .newsletterSubscribers FF (#24913)
18688610ff Merge release/26.4 into trunk (#24911)

This PR reverts those two commits in the release branch.

I'll remember to remove these two revert commits when merging the release branch into trunk. Update: commits were removed in #24933

Testing instructions

@crazytonyli crazytonyli requested review from kean and oguzkocer October 10, 2025 00:46
@dangermattic
Copy link
Collaborator

dangermattic commented Oct 10, 2025

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@crazytonyli crazytonyli added this to the 26.4 ❄️ milestone Oct 10, 2025
@crazytonyli crazytonyli merged commit 26561db into release/26.4 Oct 10, 2025
6 of 29 checks passed
@crazytonyli crazytonyli deleted the fix-release-26.4-history branch October 10, 2025 00:48
@crazytonyli
Copy link
Contributor Author

I'll merge this PR to unblock the release process.

Copy link

@wpmobilebot
Copy link
Contributor

App Icon📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress
ConfigurationRelease-Alpha
Build Number29436
VersionPR #24932
Bundle IDorg.wordpress.alpha
Commit94dc63b
Installation URL72fqo104ahfdg
Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@wpmobilebot
Copy link
Contributor

App Icon📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack
ConfigurationRelease-Alpha
Build Number29436
VersionPR #24932
Bundle IDcom.jetpack.alpha
Commit94dc63b
Installation URL3jvthp4uu64n8
Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

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.

3 participants