Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to release/dev17.12 #17443

Merged
merged 2 commits into from
Jul 25, 2024

Conversation

dotnet-bot
Copy link
Contributor

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

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

…17375)

* wip

* simplify

* release notes

* .

* release notes

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
@dotnet-bot dotnet-bot requested a review from a team as a code owner July 24, 2024 18:05
@dotnet-bot dotnet-bot force-pushed the merges/main-to-release/dev17.12 branch from 1c07568 to db4ad94 Compare July 24, 2024 18:05
Copy link
Contributor

❗ Release notes required


✅ Found changes and release notes in following paths:

Warning

No PR link found in some release notes, please consider adding it.

Change path Release notes path Description
src/Compiler docs/release-notes/.FSharp.Compiler.Service/9.0.100.md No current pull request URL (#17443) found, please consider adding it

@psfinaki psfinaki enabled auto-merge July 25, 2024 13:04
@psfinaki psfinaki merged commit 1981d46 into release/dev17.12 Jul 25, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants