Merge release/dev17.3 to main #62573
Merged
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
dotnet-bot
force-pushed
the
merges/release/dev17.3-to-main
branch
from
9d14c64
to
be8eed3
Compare
dotnet-bot
added
Area-Infrastructure
auto-merge
Merge Conflicts
|
⚠ This PR has merge conflicts. @allisonchou |
JoeRobich
removed
the
Merge Conflicts
… Build ID 1875846
… Build ID 1875846
This was referenced Jul 12, 2022
…e-43b78dc31d3b Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1875846
JoeRobich
force-pushed
the
merges/release/dev17.3-to-main
branch
from
43cbcca
to
e308b4a
Compare
… Build ID 1879091
… analyzer loader (#62627)
… Build ID 1879666
… Build ID 1879666
… Build ID 1879666
…e-31c1781b5088 Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1879666
JoeRobich
force-pushed
the
merges/release/dev17.3-to-main
branch
from
2034a52
to
e340ba5
Compare
|
@RikkiGibson Looks like VB ErrorFacts doesn't know how to respond to |
|
@RikkiGibson it looks like the tests are still failing - would you have any context? |
|
looks like C# needs the same change. |
|
@allisonchou let me know if you'd like assistance merging here. |
ghost
added this to the
333fred
added a commit
to 333fred/roslyn
that referenced
this pull request
Jul 20, 2022
* upstream/main: (66 commits) Merge release/dev17.3 to main (dotnet#62573) Fix Find the right symbol when following type forwards (dotnet#62406) Remove unused parameter (dotnet#62685) Fix NRE in nullable walker (dotnet#62773) Delete obsolete internal options (dotnet#62746) Optimize away unchecked conversions between nint and nuint types. (dotnet#62774) Delete Inline members Clean up global options usage in tests (dotnet#62692) Update dependencies from https://github.com/dotnet/source-build-externals build 20220719.2 (dotnet#62787) Update src/Workspaces/Remote/ServiceHub/Services/Renamer/RemoteRenamerService.cs No need to roundtrip symbol Unused variable formatting Get document properly Lint Simplify Remove unnecessary callbacks Add telemetry ...
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 release/dev17.3 into main.
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 -t upstream/merges/release/dev17.3-to-main git reset --hard upstream/main git merge upstream/release/dev17.3 # Fix merge conflicts git commit git push upstream merges/release/dev17.3-to-main --force