Update submodule to latest master in microsoft/main
#1383
Merged
Conversation
This file contains 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
microsoft-golang-bot
requested review from
microsoft-golang-review-bot and
a team
as code owners
microsoft-golang-review-bot
approved these changes
Oct 30, 2024
microsoft-golang-bot
force-pushed
the
dev/auto-sync/microsoft/main
branch
from
ef2fc33 to
5c9b2d6
Compare
|
Please don't resolve this conflicts until all my SymCrypt PRs are merged. |
microsoft-golang-bot
force-pushed
the
dev/auto-sync/microsoft/main
branch
from
5c9b2d6 to
5b7c726
Compare
microsoft-golang-bot
force-pushed
the
dev/auto-sync/microsoft/main
branch
4 times, most recently
from
87a909e to
0f15d0e
Compare
microsoft-golang-bot
force-pushed
the
dev/auto-sync/microsoft/main
branch
from
0f15d0e to
4f1bf64
Compare
|
CI is failing due to golang/go#70463. I've already sent a fix for it: https://go-review.googlesource.com/c/go/+/630096. |
karianna
previously approved these changes
Nov 22, 2024
auto-merge was automatically disabled
November 22, 2024 11:52
Pull request was closed
qmuntal
force-pushed
the
dev/auto-sync/microsoft/main
branch
from
2f65945 to
ee6a6bf
Compare
|
Patch conflicts resolved, now I only have to fix the tests... |
|
For #1416. |
|
The fixes necessary to reconcile our fork with upstream are growing to the point that the PR is hard to review. I'll be extracting some of the commits to their own PR. |
This was referenced Dec 12, 2024
Merged
Merged
qmuntal
force-pushed
the
dev/auto-sync/microsoft/main
branch
from
7c4ee0a to
2ba8745
Compare
qmuntal
force-pushed
the
dev/auto-sync/microsoft/main
branch
from
fb10acd to
d2ea31c
Compare
|
Finally, no conflicts and tests passing 🎉. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hi! I'm a bot, and this is an automatically generated upstream sync PR. 🔃
After submitting the PR, I will attempt to enable auto-merge in the "merge commit" configuration.
For more information, visit sync documentation in microsoft/go-infra.