-
Notifications
You must be signed in to change notification settings - Fork 4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge main to features/improved-definite-assignment #53084
Merged
330 commits merged into
features/improved-definite-assignment
from
merges/main-to-features/improved-definite-assignment
May 2, 2021
Merged
Merge main to features/improved-definite-assignment #53084
330 commits merged into
features/improved-definite-assignment
from
merges/main-to-features/improved-definite-assignment
May 2, 2021
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
…enu and the trampoline only adds parameters that are relevant to the expression
Prepend first statement of using block with a newline, if opening bracket is on same line as using statement
Add OneLocBuild to official build
It doesn't seem to be used anymore after #51815
Merge release/dev16.10 to main
Fix caret placement for argument completion snippets
Run LSP integration on rolling builds only until they're stable
Add ServiceHub implementation of IDocumentTrackingService
Update version for 16.11
Merge release/dev16.10 to main
Catch exceptions within LazyToolTip
…release/dev16.11-to-main
Merge release/dev16.11 to main
ghost
approved these changes
May 2, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Auto-approval
…ures/improved-definite-assignment
ghost
deleted the
merges/main-to-features/improved-definite-assignment
branch
May 2, 2021 08:04
This pull request was closed.
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 main into features/improved-definite-assignment.
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/improved-definite-assignment git reset --hard upstream/features/improved-definite-assignment git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/improved-definite-assignment --force