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

Patch fixup for updating submodule to latest master in microsoft/main with patch fixup #497

Merged
merged 2 commits into from
Mar 25, 2022

Conversation

dagood
Copy link
Member

@dagood dagood commented Mar 25, 2022

This PR takes the failing master -> microsoft/main PR #489 and applies a patch fixup to get auto-sync on track again.

Patch fixup was a simple git am -3 call--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:

@dagood dagood enabled auto-merge March 25, 2022 17:17
@dagood dagood merged commit c911ce7 into microsoft:microsoft/main Mar 25, 2022
@dagood dagood deleted the dev/auto-sync/microsoft/main branch March 25, 2022 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants