Skip to content

Conversation

@DedSec256
Copy link
Contributor

Minimally invasive fix for #19005

@github-actions
Copy link
Contributor

github-actions bot commented Oct 22, 2025

⚠️ Release notes required, but author opted out

Warning

Author opted out of release notes, check is disabled for this pull request.
cc @dotnet/fsharp-team-msft

@DedSec256 DedSec256 marked this pull request as ready for review October 22, 2025 21:57
@DedSec256 DedSec256 requested a review from a team as a code owner October 22, 2025 21:57
Copy link
Contributor

@edgarfgp edgarfgp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@T-Gro T-Gro added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Oct 23, 2025
@T-Gro
Copy link
Member

T-Gro commented Oct 23, 2025

/backport to release/dev18.0

@github-actions
Copy link
Contributor

Started backporting to release/dev18.0: https://github.com/dotnet/fsharp/actions/runs/18749392098

@github-actions
Copy link
Contributor

@T-Gro backporting to "release/dev18.0" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: wip
Applying: release notes
Using index info to reconstruct a base tree...
M	docs/release-notes/.FSharp.Compiler.Service/11.0.0.md
Falling back to patching base and 3-way merge...
Auto-merging docs/release-notes/.FSharp.Compiler.Service/11.0.0.md
CONFLICT (content): Merge conflict in docs/release-notes/.FSharp.Compiler.Service/11.0.0.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 release notes
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-project-automation github-project-automation bot moved this from New to In Progress in F# Compiler and Tooling Oct 23, 2025
@T-Gro T-Gro enabled auto-merge (squash) October 23, 2025 13:11
@T-Gro T-Gro merged commit 12efe3b into dotnet:main Oct 23, 2025
38 of 39 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in F# Compiler and Tooling Oct 23, 2025
@DedSec256 DedSec256 deleted the ber.a/fixUseBangTypeCheck branch October 24, 2025 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants