Merge 19.9.1 hotfix into release 20.0#18821
Merged
mokagio merged 5 commits intorelease/20.0from Jun 3, 2022
Merged
Conversation
…elease_1.76.3 Integrate gutenberg-mobile release 1.76.3
As expected when merging the current release branch into an hotfix branch from the previous version, we got conflicts on the `Version.*.xcconfig` files. As usual, I resolved them with `git checkout --theirs`, keeping the value from the release branch. Additionally, there were conflicts on the `Podfile` and `Podfile.lock`. There reason for those is that the 19.9.1 hotfix was via a new Gutenberg version, 1.76.3. Meanwhile, on 20.0, Gutenberg was bumped to 1.77.1—itself a hotfix on Gutenberg latest stable with the same fix that went into 1.76.3 I resolved those conflicts, too, by keeping the version from `release/20.0` as that was the most up-to-date.
oguzkocer
approved these changes
Jun 3, 2022
Contributor
You can test the changes in Jetpack from this Pull Request by:
|
Contributor
You can test the changes in WordPress from this Pull Request by:
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
Version.*.xcconfigfiles.As usual, I resolved them with
git checkout --theirs, keeping the value from the release branch.Additionally, there were conflicts on the
PodfileandPodfile.lock. There reason for those is that the 19.9.1 hotfix was via a new Gutenberg version, 1.76.3. Meanwhile, on 20.0, Gutenberg was bumped to 1.77.1—itself a hotfix on Gutenberg latest stable with the same fix that went into 1.76.3I resolved those conflicts, too, by keeping the version from
release/20.0as that was the most up-to-date.Because of the reasons listed above, this PR has an empty diff. This PR's only value is as a breadcrumb in the Git history of the process we followed.