Merge master to features/interpolated-string-constants#48904
Merged
333 commits merged intofeatures/interpolated-string-constantsfrom Oct 25, 2020
Merged
Conversation
…factoringProvider
… AbstractConvertConversionOperatorsRefactoringProvider
…se/dev16.9 Merge release/dev16.8 to release/dev16.9
Merge release/dev16.9 to master
Add support for an lsp language client to specify which capabilities they support.
Fix inline-temp not being offered in linked-files.
Extract some lsp diagnostic changes to make PR simpler.
Further mitigations for light bulb dismissal in 16.8
Annotate the rest of Workspace_Editor.cs
Add semantic classification for records
…Explorer We don't need to OptProf train it anymore now that it doesn't exist.
Switch the inline-hints shortcut from ctrl-alt to alt-f1
Delete our pinning of the Microsoft.Net.Test.Sdk package and let it flow from arcade.
…lorershim-assembly Delete the SolutionExplorerShim assembly and merge it into our VisualStudio.Implementation project
Use resource string in NewTypeDestinationSelection component
Rename Roslyn.Test.Utilities.csproj to Microsoft.CodeAnalysis.Test.Utilities.csproj
Add ProjectSystem APIs for UnusedReferences
IDE0063 code fix now keeps nearby comments
|
Hello @dotnet-bot! Because this pull request has the Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 minutes. No worries though, I will be back when the time is right! 😉 p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
This pull request was closed.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 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 is an automatically generated pull request from master into features/interpolated-string-constants.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
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/master-to-features/interpolated-string-constants git reset --hard upstream/features/interpolated-string-constants git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/interpolated-string-constants --force