Skip to content

Conversation

@dotnet-bot
Copy link
Contributor

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

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

… consistent (#17859)

* merge

* revert Reverting PR - Make the interaction between #line and #nowarn directives consistent
@github-actions
Copy link
Contributor

github-actions bot commented Oct 10, 2024

⚠️ 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

Copy link
Member

@T-Gro T-Gro left a comment

Choose a reason for hiding this comment

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

Why is EmptyBodiedComputationExpressions removed from mapping and not just moved to preview?

@vzarytovskii
Copy link
Member

Fixed

@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 10, 2024
@T-Gro T-Gro disabled auto-merge October 23, 2024 09:31
@T-Gro T-Gro enabled auto-merge October 23, 2024 09:32
@psfinaki psfinaki disabled auto-merge October 23, 2024 11:46
@psfinaki psfinaki merged commit 85f090f into main Oct 23, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure auto-merge Merge Conflicts 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.

6 participants