Bring changes from rnmobile/release-v1.17.0 back to master#18588
Merged
Bring changes from rnmobile/release-v1.17.0 back to master#18588
Conversation
Loading
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This PR is to bring the changes from the 1.17.0 gutenberg-mobile release back to the
masterbranch. Ideally, we would do this with a PR directly fromrnmobile/release-v1.17.0tomaster, but it appears that a number of commits from themasterbranch were pulled into thernmobile/release-v1.17.0with different hashes (maybe here), which is causing a PR between those branches to "include" a number of commits that are already on master (with a different hash).In order to avoid confusion about what changes are being brought in and reduce the risk of messing up the git history with the commits that were not related to the 1.17.0 mobile release, I created this
rnmboile/1.17_squashed_onto_masterbranch by checking out master and then squashing thernmobile/release-v1.17.0branch onto it. As you would expect, the diff for mergingrnmobile/release-v1.17.0back tomasterand the diff for this PR appear to be the same, but the number of commits in this PR is 1 as compared to 124 commits in the PR fromrnmobile/release-v1.17.0.