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 release/dev17.4 to release/dev17.5 #14364

Merged
merged 3 commits into from
Nov 22, 2022

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from release/dev17.4 into release/dev17.5.

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

* WIP: Fix for calling init-only setter via srtp call + allow calling special-named functions via srtp
* Fix 14097

Co-authored-by: Vlad Zarytovskii <[email protected]>
Co-authored-by: Tomas Grosup <[email protected]>
Co-authored-by: Don Syme <[email protected]>
@dotnet-bot dotnet-bot requested a review from a team as a code owner November 21, 2022 18:04
@dotnet-bot dotnet-bot force-pushed the merges/release/dev17.4-to-release/dev17.5 branch from b1976ad to 1d892dd Compare November 21, 2022 18:04
@dotnet-bot dotnet-bot enabled auto-merge November 21, 2022 18:05
@dotnet-bot dotnet-bot merged commit 7140a15 into release/dev17.5 Nov 22, 2022
@T-Gro T-Gro deleted the merges/release/dev17.4-to-release/dev17.5 branch February 2, 2023 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants