Merge main to feature/auto-widen #10918
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
Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21068.2 -> To Version 6.0.0-beta.21069.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
dsyme
added a commit
that referenced
this pull request
Aug 13, 2021
* merge main * merge main * fix some misc bits and pieces * fix bug * assert constructor return type * no subsumption for type-directed records * fix bootstrap build * fix test * fix test baselines * respect rigid type annotations within expressions * respect rigid type annotations within expressions * reenable rigid type annotations within expressions * update baseline * add language version check * adjust test baseline for better error recovery * adjust test baseline for better error recovery * Merge main to feature/auto-widen (#10918) * [main] Update dependencies from dotnet/arcade (#10913) Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21068.2 -> To Version 6.0.0-beta.21069.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Refactor everything but the type provider tests in signature help testing (#10908) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Phillip Carter <[email protected]> * fixes for type directed conversion for optional args, backwards compat for overloads * op_Implicit support * update baselines * fix bug in nullable codegen * fix tests * fix unions and records * ignore hanging test for now * fix hang * update baseline * trim trailing spaces * simplify expression leaf logic and make regular * fix build * update testing * update baselines * cache implicit operator lookup * add op_Implicit tests: checks, options, ambiguities, extrinsic extensions * remove int32 --> float32 and floar32 --> float64, improve error messages * update baseline and improve errors * update message * adjust mechanism and policy for warnings * adjust warnings implementation and policy * Update FSharp.Test.Utilities.fsproj * Update FSharp.Compiler.Service.Tests.fsproj * Fix merge issue * Update CheckExpressions.fs Co-authored-by: Don Syme <[email protected]> Co-authored-by: dotnet bot <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Phillip Carter <[email protected]> Co-authored-by: Kevin Ransom (msft) <[email protected]> Co-authored-by: Vlad Zarytovskii <[email protected]>
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 feature/auto-widen.
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-feature/auto-widen git reset --hard upstream/feature/auto-widen git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-feature/auto-widen --force