-
Notifications
You must be signed in to change notification settings - Fork 4k
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
Conversation
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
… Build ID 1662698 (#60168)
…se/dev17.2 Merge release/dev17.1 to release/dev17.2
… Build ID 1674979 (#60301)
… Build ID 1676641
… Build ID 1676641
… Build ID 1676641
… Build ID 1676641
Merge main to release/dev17.2
…0ccccd4-9f1e-4ab0-aa62-1631ded6ae1f
Build official builds of dev17.1 branch
…se/dev17.2 Merge release/dev17.1 to release/dev17.2
…0-581cf8cec9ab Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1693428
… Build ID 1700800
… Build ID 1700800
… Build ID 1700800
… Build ID 1700800
… Build ID 1701033
… Build ID 1701033
… Build ID 1701033
… Build ID 1701033
…c-295b27dc6ca7 Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033
…elease/dev17.2-to-main
b874a1f
to
bd9c757
Compare
@RikkiGibson or @cston - could one of you all take a look at the build failures in |
@RikkiGibson, please review the latest commit which updates the affected |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved
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