Merge beta 26.1.0.2 into trunk with conflicts resolution
#20052
Closed
Conversation
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
…ad (#20013) When showing UIAlertViewController as actionSheet on iPad sourceView and sourceRect is required to be set to avoid a crash.
…elease_1.87.3 Integrate gutenberg-mobile release 1.87.3
Conflicts on `Podfile.lock` because the `Podfile` changed in both `trunk` and `release/21.6`, resulting in the lockfile checksum conflicting. Addressed by re-running `bundle exec pod install` to generate an up-to-date checksum.
mokagio
requested review from
a team,
JB184351,
lmischner and
spencertransier
and removed request for
a team,
JB184351,
lmischner and
spencertransier
Contributor
Author
|
@spencertransier @JB184351 @lmischner, sorry for the spam. I selected the |
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:
|
Contributor
|
@mokagio Heads up that I've just merged a PR that updated the Gutenberg Mobile reference, the latest tag and the one to use for solving the conflict is: |
Contributor
Author
|
Thanks for the ping @fluiddot . |
3 tasks
Contributor
Author
|
Superseded by #20062 |
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.
Conflicts on
Podfile.lockbecause thePodfilechanged in bothtrunkandrelease/21.6, resulting in the lockfile checksum conflicting. Addressed by re-runningbundle exec pod installto generate an up-to-date checksumIncludes
Also, already merged in
trunkbut shipped with this beta:Release checks
.stringsand Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress.xcconfig