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 release/14.2 to develop #11323

Merged
merged 11 commits into from
Feb 20, 2020
Merged

Merge release/14.2 to develop #11323

merged 11 commits into from
Feb 20, 2020

Conversation

oguzkocer
Copy link
Contributor

Due to the gutenberg hotfix there was a conflict merging back to develop. I've accepted the commit hash in develop for libs/gutenberg-mobile but in this case the hash in release/14.2 might be the correct one. @hypest Do you mind verifying that hash for gutenberg will be correct after this merge? If it is not correct, please feel free to directly commit in this branch with the correct hash. Thanks!

@oguzkocer oguzkocer added the Releases Label related to managing releases label Feb 14, 2020
@oguzkocer oguzkocer added this to the 14.2 ❄️ milestone Feb 14, 2020
@oguzkocer oguzkocer requested review from hypest and jkmassel February 14, 2020 22:21
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Feb 14, 2020

You can test the changes on this Pull Request by downloading the APK here.

Copy link
Contributor

@jkmassel jkmassel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR looks good to me.

AFAICT #11298 contains 1.22.1 and develop contains 1.22 (3dc3f1b) so we should actually favour the one in this release branch if we want the most recent build. I presume the 1.23 version will also contain the changes from 1.22.1, but I'm not sure what we want to do in the interim.

@hypest – I leave this in your court – I'm ok with everything else besides this so feel free to merge at your discretion!

@oguzkocer
Copy link
Contributor Author

@hypest It'd be great if you can take a look at this one when you get a chance. Thanks!

@mchowning
Copy link
Contributor

mchowning commented Feb 20, 2020

👋 @oguzkocer ! We want the gutenberg ref for 1.22.1 from the release branch in favor of the 1.22.0 ref on develop (so basically, what @jkmassel said 😀). I did a quick smoke test with that change and everything looks good so I went ahead and pushed the update to this branch.

@oguzkocer oguzkocer merged commit 9818a02 into develop Feb 20, 2020
@oguzkocer oguzkocer deleted the issue/merge-14.2-to-develop branch February 20, 2020 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants