Merge main to features/caller-argument-expression#53776
Merged
640 commits merged intofeatures/caller-argument-expressionfrom Jun 1, 2021
Merged
Merge main to features/caller-argument-expression#53776640 commits merged intofeatures/caller-argument-expressionfrom
640 commits merged intofeatures/caller-argument-expressionfrom
Conversation
Merge inheritance margin feature
Merge main to main-vs-deps
Merge main to main-vs-deps
…-to-main-vs-deps Merge release/dev16.10-vs-deps to main-vs-deps
Merge main to main-vs-deps
…to run on 16.10p1
Workaround breaking change to allow LSP integration tests to run on 16.10p1
…-to-main-vs-deps Merge release/dev16.10-vs-deps to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
Merge main to main-vs-deps
* Update Debugger.Contracts to 16.10.0-beta.21214.1 * Fix
Resolved one unresolved conflict
Fix optprof config drop path
…embly-name Add a parameter to pass through the initial assembly name
* Add API Review Process Documentation We're currently working on making a more formal API review process for Roslyn. This PR adds documentation to the repo on how that process works, and the general expectations for how the process should work. Much of this documentation is copied from dotnet/runtime, and modified to fit the repo. Co-authored-by: Youssef Victor <youssefvictor00@gmail.com> Co-authored-by: Joseph Musser <me@jnm2.com> Co-authored-by: Joey Robichaud <jorobich@microsoft.com>
Merge release/dev16.11 to main
Enable nullable reference types integration test harness
[main] Update dependencies from dotnet/arcade
Reflects whether the switch expression generates an implicit non-exhaustive throw arm. Co-authored-by: AlekseyTs <AlekseyTs@users.noreply.github.com> Co-authored-by: Fredric Silberberg <frsilb@microsoft.com>
…sFix Binding zoom level to Inheritance margin
Remove workaround for 16.10p2 now that 16.10 has shipped
…release/dev16.11-to-main
Merge release/dev16.11 to main
Collaborator
Author
|
⚠ This PR has merge conflicts. @333fred |
…o-features/caller-argument-expression
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/caller-argument-expression.
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/caller-argument-expression git reset --hard upstream/features/caller-argument-expression git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/caller-argument-expression --force