Merge main to release/dev17.9 #16465
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
#16439) * Using Ordinal is both faster and more correct as our intent is to do symbolic compares. * format code * use extension methods
* Add additional release note entries.
…precedence (#16372) * Keep parens for non-ident. op pairs with same prec * Keep parens in cases like `f <| (g << h)`, `x + (y ++ z)`, etc. * Keep parens around "relational" ops even when same * The order of operations in `x > (y < z)` or `x <> (y <> z)` is not necessarily immediately obvious, and there are built-in operators in this class like `<|` for which the associativity of the underlying operation depends on the types of the operands. * Add entry to FCS release notes
* Improve value restriction error message #1103 * Update the error message * Update message * Update tests * Update error message * Update messages * Add line back * Update error messages * Update E_ValueRestriction01.fs * Update messages * Update messages * Update messages * Does this work? * hmm * Update function message * Escape () * Update tests * Update messages * Update CompilerDiagnostics.fs * Update CompilerDiagnostics.fs --------- Co-authored-by: Petr <psfinaki@users.noreply.github.com>
* Name resolution: don't create fake items for interfaces * More experiments * Tweak nameof * Update baselines * Record special occurrence kind * Add tests * Fantomas * Cleanup * Rename
dotnet-bot
force-pushed
the
merges/main-to-release/dev17.9
branch
from
6a6657a to
99514c0
Compare
vzarytovskii
approved these changes
Dec 22, 2023
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 release/dev17.9.
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/main-to-release/dev17.9 git reset --hard upstream/release/dev17.9 git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-release/dev17.9 --force