Mergeback v1 to main #215
Merged
Mergeback v1 to main #215
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
Merge main into v1
Merge main into v1
Merge main into v1
Merge main into v1
Merge main into v1
Merge main into v1
Disable snippets by default
robertbrignull
approved these changes
Sep 17, 2020
Contributor
There was a problem hiding this comment.
I think this is now correct. I branched from
v1, and mergedmaininto it.
I think I would normally do it the other way around, but the order doesn't really matter so long as both branches are ancestors. I checked locally and everything looks correct from a git graph point of view.
Since this is just a mergeback I'll merge myself now to make sure it gets in before anything else changes.
Merged
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.
Realign
mainwithv1after #210I think this is now correct. I branched from
v1, and mergedmaininto it.Merge / deployment checklist