Merge master to features/local-function-attributes #38891
Merged
Conversation
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
Merge master to master-vs-deps
Merge master to master-vs-deps
Merge master to master-vs-deps
… merges/release/dev16.3-preview1-to-release/dev16.3-preview1-vs-deps
Fixing up a mis-merge.
…ps' into merges/release/dev16.3-preview1-vs-deps-to-master-vs-deps
…-vs-deps-to-master-vs-deps Merge release/dev16.3-preview1-vs-deps to master-vs-deps
…-to-release/dev16.3-preview1-vs-deps Merge release/dev16.3-preview1 to release/dev16.3-preview1-vs-deps
…-vs-deps-to-master-vs-deps Merge release/dev16.3-preview1-vs-deps to master-vs-deps
Update VS editor SDK version
Merge master to master-vs-deps
and made navigate to to report partial load information
…-to-release/dev16.3-preview1-vs-deps Merge release/dev16.3-preview1 to release/dev16.3-preview1-vs-deps
…-vs-deps-to-master-vs-deps Merge release/dev16.3-preview1-vs-deps to master-vs-deps
Merge master to master-vs-deps
Merge master to master-vs-deps
Merge master to master-vs-deps
Merge dev16.3-vs-deps to dev16.3
…erges/release/dev16.3-to-release/dev16.4-preview1
…se/dev16.4-preview1 Merge release/dev16.3 to release/dev16.4-preview1
…6.4-preview1-to-master
…6.4-preview1-to-master
Spelling fixes
…-to-master Merge release/dev16.4-preview1 to master
Spelling fixes
|
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 (
|
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.
This is an automatically generated pull request from master into features/local-function-attributes.
(created from a manual run of the PR generation tool)
git fetch --all git checkout merges/master-to-features/local-function-attributes git reset --hard upstream/features/local-function-attributes git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/local-function-attributes --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.