Merge hotfix 21.8.2 into release 21.9 #20311
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As expected when merging the current release branch into an hotfix branch from the previous version, we got conflicts on the `config/Version.*.xcconfig` files. As usual, I resolved them with `git checkout --theirs`, keeping the value from the release branch. There were also conflicts in `WordPress/Classes/System/WordPressAppDelegate.swift`. Those were solved by keeping the version from the hotfix.
You can test the changes in Jetpack from this Pull Request by:
|
You can test the changes in WordPress from this Pull Request by:
|
dvdchr
approved these changes
Mar 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As expected when merging the current release branch into an hotfix branch from the previous version, we got conflicts on the
config/Version.*.xcconfigfiles.As usual, I resolved them with
git checkout --theirs, keeping the value from the release branch.There were also conflicts in
WordPress/Classes/System/WordPressAppDelegate.swift. Those were solvedby keeping the version from the hotfix. @dvdchr, as the author of the fix (#20304) could you please confirm the resolution was correct? Thanks! I'm 99% sure, since the resulting diff is the same as #20304.
Notice that the diff is equivalent to #20304 and #20308 put together.