Merges/main to release/dev16.8 #10172
Merged
Conversation
This file contains 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
Add FSharp.Compiler.Service.Tests to FCS solution
Co-authored-by: Don Syme <[email protected]>
Co-authored-by: Don Syme <[email protected]>
fix nameof bug for operators
…erences (#10160) Co-authored-by: Don Syme <[email protected]>
cartermp
approved these changes
Sep 22, 2020
|
Thanks @KevinRansom |
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.
Manually opened by kevinr
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all
git checkout merges/main-to-release/dev16.8
git reset --hard upstream/release/dev16.8
git merge upstream/main
Fix merge conflicts
git commit
git push upstream merges/main-to-release/dev16.8 --force