fsharp icon indicating copy to clipboard operation
fsharp copied to clipboard

Merge main to release/dev17.10

Open dotnet-bot opened this issue 1 year ago • 1 comments

This is an automatically generated pull request from main into release/dev17.10.

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:

  • https://github.com/dotnet/fsharp/find/main
  • https://github.com/dotnet/fsharp/find/release/dev17.10

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.10
git reset --hard upstream/release/dev17.10
git merge upstream/main
# Fix merge conflicts
git commit
git push upstream merges/main-to-release/dev17.10 --force

dotnet-bot avatar Feb 24 '24 09:02 dotnet-bot

:heavy_exclamation_mark: Release notes required

@dotnet-bot,

[!CAUTION] No release notes found for the changed paths (see table below).

Please make sure to add an entry with an informative description of the change as well as link to this pull request, issue and language suggestion if applicable. Release notes for this repository are based on Keep A Changelog format.

The following format is recommended for this repository:

* <Informative description>. ([PR #XXXXX](https://github.com/dotnet/fsharp/pull/XXXXX))

See examples in the files, listed in the table below or in th full documentation at https://fsharp.github.io/fsharp-compiler-docs/release-notes/About.html.

If you believe that release notes are not necessary for this PR, please add NO_RELEASE_NOTES label to the pull request.

You can open this PR in browser to add release notes: open in github.dev

Change path Release notes path Description
src/Compiler docs/release-notes/.FSharp.Compiler.Service/8.0.300.md No release notes found or release notes format is not correct

github-actions[bot] avatar Feb 24 '24 09:02 github-actions[bot]

@vzarytovskii can you please merge this PR in? We need https://github.com/dotnet/fsharp/commit/d071ddc854baf5fa016987360d5216739c251da1 in the SDK and fsharp flows the dev17.10 branch into sdk main.

ViktorHofer avatar Feb 26 '24 15:02 ViktorHofer