Merge stuff that has been given up by manual merges #2448
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
This fixes up ab8f346 (a manual merge) that has abandoned some things from PR google#2395.
This fixes up f2fb48c (a manual merge) that has abandoned some things from PR google#2407.
kuzkry
force-pushed
the
bad-googletest-export
branch
from
515aa3d
to
3339b97
Compare
kuzkry
changed the title
|
273570181 This happens sometimes because the SoT for the development is internal and the process is not ideal. |
|
@gennadiycivil, I realised that some time ago :) But it's nice you started warning people about it. |
|
gennadiycivil
added a commit
that referenced
this pull request
Oct 10, 2019
PiperOrigin-RevId: 273585026
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.
Leftovers from improperly closed manual reviews.