Merge main to release/dev17.13 #18154
Open
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
* Show default value of compiler options * Locale files * Revert "Show default value of compiler options" This reverts commit 842c2c1. * Revert "Locale files" This reverts commit 47de522. * Draft * Auto-generated default values * Update compiler_help_output.bsl * Format file * Update expected-help-output.bsl * Update help baseline files * Update release notes --------- Co-authored-by: nih0n <[email protected]>
* rebase * orchestrate instead of Async.Sleep * xunit customizations behind conditional compilation * make console capture explicit * diff * try fix test * lazy pattern * reenable extras * test temptath * cleaup test dir * remove unneeded file * fix merge * another shot at fixing gc test * another attempt at improving Async.Parallel test * smaller diff * restore test * restore tests * diff * unblock service tests * rename attributes * fix * revert - should now work without * add comment * diff * diff Co-authored-by: Petr <[email protected]> * just exclude gc test * diff * exclude test case * try to trigger clr error in ci * try unflake test * unflake asyncmemo * ilverify * fix merge * some cleanup * Update tests/fsharp/Compiler/CodeGen/EmittedIL/DeterministicTests.fs Co-authored-by: Petr <[email protected]> * remove timeout * Make FsiTests sequential * restore ci throttling * min diff * add comment * bring down the parallelizm a notch on mac and linux --------- Co-authored-by: Petr <[email protected]> Co-authored-by: Vlad Zarytovskii <[email protected]> Co-authored-by: Kevin Ransom (msft) <[email protected]>
dotnet-bot
force-pushed
the
merges/main-to-release/dev17.13
branch
from
ee84e06 to
65a9f1e
Compare
❗ Release notes required
Warning No PR link found in some release notes, please consider adding it.
|
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
KevinRansom
requested changes
Dec 20, 2024
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.13.
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.13 git reset --hard upstream/release/dev17.13 git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-release/dev17.13 --force