Merge main to features/list-patterns#52548
Merged
145 commits merged intofeatures/list-patternsfrom Apr 11, 2021
Merged
Conversation
"Add null check" inserts single line statements if preferred
Add publish data for d17p1 branch
…w' into infra/msbuildworkspace-small-fixes
Use CancellationSeries in ExternalErrorDiagnosticUpdateSource
Update CONTRIBUTING.md
use target typed new expressions
Load NuGet assemblies on a background thread
* Remove use of Editor.INavigationBarItemService in LSP Currently, the DocumentSymbolsHandler uses the editor version of INavigationBarItemService. Thanks to Cyrus's recent work around refactoring the nav bars for OOP, we now have a clean Features-layer API that we can seemlessly transition the handler to with minimal changes. I've done this, as well as a bit of general cleanup (enable nullable, fix a memory leak, a couple other things).
[main] Update dependencies from dotnet/roslyn
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
17 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 main into features/list-patterns.
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/main-to-features/list-patterns git reset --hard upstream/features/list-patterns git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/list-patterns --force