Merge main with conflicts#57278
Merged
RikkiGibson merged 10000 commits intodotnet:features/param-nullcheckingfrom Oct 20, 2021
Merged
Merge main with conflicts#57278RikkiGibson merged 10000 commits intodotnet:features/param-nullcheckingfrom
RikkiGibson merged 10000 commits intodotnet:features/param-nullcheckingfrom
Conversation
Loading
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 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.
Related to #36024
Straight merge of 'main' to the param-nullchecking feature branch. All the conflict markers are left in and will be resolved in a follow-up PR.
I started to try and do some tricks with merging to a merges/ branch first, and PRing the conflict resolutions to the merges/ branch, but I think makign the squashing work how we want to avoid conflict markers in "real" commits is going to be harder than anticipated and not worth the hassle.