Use googletest's new 'main' branch #38409
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
|
'main' is the default branch in dotnet/googletest now. We'll need this in our servicing branches except release/2.1. @mmitche @wtgodbe to conform: Those branches all remain open 'til EOD today❔ In any case, I'm opening the backport PRs. Note there isn't really a rush to complete this today. It's just better if we don't have to do the work later, when we realize the submodule isn't keeping up anymore. |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1463970064 |
|
@dougbu backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Use googletest's new 'main' branch
Using index info to reconstruct a base tree...
M .gitmodules
M src/submodules/googletest
Falling back to patching base and 3-way merge...
Failed to merge submodule src/submodules/googletest (not checked out)
Auto-merging src/submodules/googletest
CONFLICT (submodule): Merge conflict in src/submodules/googletest
Auto-merging .gitmodules
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use googletest's new 'main' branch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
dougbu
added a commit
to dougbu/aspnetcore
that referenced
this pull request
Nov 15, 2021
- backport of dotnet#38409 due to submodule conflicts
github-actions bot
pushed a commit
that referenced
this pull request
Nov 15, 2021
…due to submodule conflicts
github-actions bot
pushed a commit
that referenced
this pull request
Nov 15, 2021
…due to submodule conflicts
This was referenced Nov 15, 2021
wtgodbe
approved these changes
Nov 15, 2021
dougbu
added a commit
that referenced
this pull request
Nov 15, 2021
- backport of #38409 due to submodule conflicts
dougbu
added a commit
that referenced
this pull request
Nov 15, 2021
dougbu
added a commit
that referenced
this pull request
Nov 16, 2021
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.
No description provided.