Merge master to features/interpolated-string-constants#49225
Merged
113 commits merged intofeatures/interpolated-string-constantsfrom Nov 8, 2020
Merged
Conversation
Co-Authored-By: Sam Harwell <sam@tunnelvisionlabs.com>
Co-Authored-By: Sam Harwell <sam@tunnelvisionlabs.com>
Co-authored-by: Jason Malinowski <jason@jason-m.com> Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com> Co-authored-by: David Wengier <dawengie@microsoft.com>
…seAutoPropertyCodeFixProvider.vb
This is a follow up on two previous PRs. Closes #45758.
Convert .ruleset to .globalconfig
UnitTesting and Razor External Access wrappers for ISB services
Fix extract local function crash
Merge release/dev16.9 to master
* Remove unused member * Remove unused text view field and parameters * Remove unused parameter from AddReference method * Remove method that doesn't do anything * Remove unused return value * Remove unused parameters * Remove previously unreachable code * Remove method that doesn't do anything * Remove method that doesn't do anything * Remove unused local * Remove unused method * Remove old file * Clean up usings * Nullable enable, and annotate * Fix naming violations * Use pattern matching * Use switch statement * Use indexes and ranges * Change field to property
[LSP] Re-enable folding range provider
… of unconstrained type parameter type (#48803)
…rs_up Change select/deselect all checkbox to buttons in Pull Members Up
Fix RazorRemoteHostClient to maintain binary back-compat
Further tweak rendering of inline hints
|
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