Patch fixup for updating submodule to latest master in microsoft/main with patch fixup#497
Merged
dagood merged 2 commits intoMar 25, 2022
Conversation
chsienki
approved these changes
Mar 25, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR takes the failing
master->microsoft/mainPR #489 and applies a patch fixup to get auto-sync on track again.Patch fixup was a simple
git am -3call--nothing needed manual resolution, so I'll turn on auto-merge with one approval.Initially I pushed a patch fixup to #489 directly, but it hit test flakiness on Windows so it didn't auto-merge. Then, the auto-update infra force-pushed a new commit that got rid of my fixup.
Related: