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/19.6 (19.6-rc-3) #16319

Merged
merged 11 commits into from
Apr 14, 2022
Merged

Merge release/19.6 (19.6-rc-3) #16319

merged 11 commits into from
Apr 14, 2022

Conversation

ParaskP7
Copy link
Contributor

@ParaskP7 ParaskP7 commented Apr 13, 2022

Merging the release branch after doing a new 19.6-rc-3 beta.

This new beta contains:

Merge Conflicts:

<<<<<<< merge/release-19.6-rc-3
    <string name="new_site_creation_intents_header_subtitle">Choose a topic from the list below or type your own.</string>
    <string name="new_site_creation_intents_input_hint">E.g. Fashion, Poetry, Politics</string>
=======
    <string name="new_site_creation_intents_header_subtitle">Choose a topic from the list below or type your own</string>
    <string name="new_site_creation_intents_input_hint">Eg. Fashion, Poetry, Politics</string>
    <string name="new_site_creation_site_name_title">Site name</string>
    <string name="new_site_creation_site_name_header_title">Give your website a name</string>
    <string name="new_site_creation_site_name_header_subtitle">A good name is short and memorable.\nYou can change it later</string>
>>>>>>> trunk

And I kept the merge/release-19.6-rc-3 in favor of the trunk version for the 2 x conflicting strings, while I kept the 3 x non-conflicting new strings that were on trunk.

@ParaskP7 ParaskP7 added the Releases Label related to managing releases label Apr 13, 2022
@ParaskP7 ParaskP7 added this to the 19.6 ❄️ milestone Apr 13, 2022
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Apr 13, 2022

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@ParaskP7 ParaskP7 requested review from a team and antonis April 13, 2022 11:47
@ParaskP7 ParaskP7 marked this pull request as ready for review April 13, 2022 11:47
@ParaskP7 ParaskP7 enabled auto-merge April 13, 2022 11:47
@ParaskP7 ParaskP7 disabled auto-merge April 13, 2022 11:51
@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APKs:

Copy link
Contributor

@antonis antonis left a comment

Choose a reason for hiding this comment

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

Great work @ParaskP7 👍
I did a quick sanity test of the CI produced build on a Pixel 5 (Android 12) and didn't notice any issues.
I confirm that my changes are included in this PR. The rest of the code and string changes also look consistent to me. 🎉

@ParaskP7
Copy link
Contributor Author

Thank you so much for reviewing and testing it @antonis ! 🥇 🙇

@ParaskP7 ParaskP7 merged commit 37133a0 into trunk Apr 14, 2022
@ParaskP7 ParaskP7 deleted the merge/release-19.6-rc-3 branch April 14, 2022 11:01
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.

4 participants