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.2 to main #60490

Merged
67 commits merged into from
Apr 11, 2022
Merged

Merge release/dev17.2 to main #60490

67 commits merged into from
Apr 11, 2022

Conversation

dotnet-bot
Copy link
Collaborator

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

JoeRobich and others added 27 commits January 28, 2022 09:48
Add build triggers to azure pipeline yaml
…to-release/dev16.11-vs-deps

Merge release/dev16.9-vs-deps to release/dev16.11-vs-deps
…-to-release/dev17.0-vs-deps

Merge release/dev16.11-vs-deps to release/dev17.0-vs-deps
[17.1 servicing] Update version of Microsoft.VisualStudio.Telemetry
…to-release/dev17.1

Merge release/dev17.0-vs-deps to release/dev17.1
…se/dev17.2

Merge release/dev17.1 to release/dev17.2
@dotnet-bot dotnet-bot requested review from a team as code owners March 30, 2022 22:40
@dotnet-bot dotnet-bot requested a review from a team as a code owner April 1, 2022 21:06
JoeRobich and others added 13 commits April 1, 2022 15:58
…0-581cf8cec9ab

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1693428
…c-295b27dc6ca7

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033
@dibarbet dibarbet force-pushed the merges/release/dev17.2-to-main branch from b874a1f to bd9c757 Compare April 8, 2022 21:23
@dibarbet
Copy link
Member

dibarbet commented Apr 8, 2022

@RikkiGibson or @cston - could one of you all take a look at the build failures in StructConstructorTests? Looks like an error code was removed in main and used in 17.2, but just using the replacement from main seems to not be passing tests

@cston
Copy link
Member

cston commented Apr 9, 2022

@RikkiGibson, please review the latest commit which updates the affected StructConstructorTests, thanks.

@cston cston requested a review from RikkiGibson April 9, 2022 04:50
@cston cston disabled auto-merge April 9, 2022 04:51
@ghost ghost merged commit ae66fbc into main Apr 11, 2022
@ghost ghost added this to the Next milestone Apr 11, 2022
@ghost ghost deleted the merges/release/dev17.2-to-main branch April 11, 2022 07:25
Copy link
Contributor

@RikkiGibson RikkiGibson left a comment

Choose a reason for hiding this comment

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

Approved

@dibarbet dibarbet modified the milestones: Next, 17.3.P1 Apr 25, 2022
This pull request was closed.
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.

8 participants