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.

Sign up for GitHub

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

Jump to bottom

Merge 1.43.0 release back to the development branch after resolving conflicts #2929

Merged
merged 19 commits into from
Dec 23, 2020
Merged

Merge 1.43.0 release back to the development branch after resolving conflicts #2929

merged 19 commits into from
Dec 23, 2020

Conversation

guarani
Copy link
Contributor

@guarani guarani commented Dec 23, 2020

This PR was needed because there are conflicts on the trunk → develop branch here: #2909

To avoid pushing straight to trunk, a new branch is made here called merge_release_1.43.0_to_develop, develop is merged into it, conflicts are resolved, and this PR merges this to develop. This has the result of updating develop with the release that's in trunk.

To test

Check that the Gutenberg submodule ref points to WordPress/gutenberg@a454634, as described in #2909 (review).

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

guarani and others added 19 commits December 7, 2020 19:50
@guarani
Release script: Update gb mobile version to 1.43.0
51ddec7
@guarani
Release script: Update gutenberg ref
fa1a958
@guarani
Release script: Update bundle for: 1.43.0
2a6cc0b
@jd-alexander
Updated gutenberg ref to include formatting bug fix.
e9750a3
@jd-alexander
Updated bundle.
94cc6d1
@jd-alexander
Updated release notes for the formatting bug fix.
657de73
@Tug
Target gutenberg hotfix branch rnmobile/hotfix-1.42.2
fc88de0
@Tug
Add release note
c93513b
@Tug
Update bundles
68acd80
@Tug
Update version in package.json
25f0e3f
@guarani
Add prettier changes
3214b87
@cameronvoell
Local changes after npm install
98a26b4
@jd-alexander
Merge pull request #2893 from wordpress-mobile/hotfix/v1.42.2
e99c3f6 
Hotfix: Fix crash when deleting a block
@cameronvoell
Updated gutenberg ref
9c2fd70
@cameronvoell
Updated bundle
bdbffff
@cameronvoell
Merge branch 'trunk' into release/1.43.0
82f5631
@cameronvoell
Updated release notes
ae178a4
@cameronvoell
Merge pull request #2874 from wordpress-mobile/release/1.43.0
1884f06 
Release 1.43.0
@guarani
Merge branch 'develop' into merge_release_1.43.0_to_develop
5c767f2
@guarani guarani requested a review from ceyhun December 23, 2020 16:11
@guarani guarani mentioned this pull request Dec 23, 2020
Merged
2 tasks
ceyhun
ceyhun approved these changes Dec 23, 2020
View reviewed changes
Copy link
Contributor

@ceyhun ceyhun left a comment

Choose a reason for hiding this comment

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

LGTM!

@guarani guarani merged commit 84825d6 into develop Dec 23, 2020
@guarani guarani deleted the merge_release_1.43.0_to_develop branch December 23, 2020 16:56
@guarani guarani added this to the 1.45 (16.6) milestone Jan 4, 2021
@guarani guarani mentioned this pull request Jan 4, 2021
Closed
2 tasks
@guarani guarani modified the milestones: 1.45 (16.6), 1.44 (16.5) Jan 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ceyhun ceyhun ceyhun approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.44 (16.5)
Development

Successfully merging this pull request may close these issues.
5 participants
@guarani @ceyhun @jd-alexander @Tug @cameronvoell