Conversation
Update documentation for new minimum dependencies
…in SyntaxParser.Reset (#48393) * Ensure that tokens are refetched to the position in the reset point in SyntaxParser.Reset Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1179569. * Fix spacing * Change number for ERR_UnexpectedVarianceStaticMember
Get VS Color ThemeId without using dynamic
CI workarounds for 16.8 Preview 3
Avoid binding the world looking for target-typed new
|
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 (
|
Update PreRelease version for Preview 5
…012.2 (#48513) [master] Update dependencies from dotnet/roslyn
Remove C#/VB dependency on inline hints.
|
@sharwell |
|
@msftbot require approval from @sharwell |
|
Hello @sharwell! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
|
@AlekseyTs I'm not sure how to resolve the conflict in ErrorCode.cs. |
|
@msftbot require approval from @AlekseyTs |
|
Hello @sharwell! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
Changing the number for ERR_FunctionPointersCannotBeCalledWithNamedArguments should work, I think. |
|
@AlekseyTs Thanks, that's the approach I used in the merge commit |
This is an automatically generated pull request from release/dev16.8 into master.
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/release/dev16.8-to-master git reset --hard upstream/master git merge upstream/release/dev16.8 # Fix merge conflicts git commit git push upstream merges/release/dev16.8-to-master --force