Skip to content

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from release/dev17.9 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.9-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.9
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.9-to-main --force

vzarytovskii and others added 30 commits September 25, 2023 17:58
…16104) (#16117)

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
KevinRansom and others added 19 commits December 14, 2023 11:40
…d-dcf3923c88b2

Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2336396
… Build ID 2340493 (#16451)

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2337694

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2337694

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2337694

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2337694

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2340493

---------

Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
… Build ID 2350228 (#16505)

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2348599

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2348599

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2348599
Copy link
Contributor

github-actions bot commented Jan 12, 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

@vzarytovskii vzarytovskii added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Jan 12, 2024
@vzarytovskii vzarytovskii disabled auto-merge January 12, 2024 12:46
@vzarytovskii
Copy link
Member

This will need to be squashed

@vzarytovskii vzarytovskii merged commit b0c2106 into main Jan 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure auto-merge 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.

4 participants