Fix clang format issue with multiple gtest includes in etag_test due to merge conflict resolution. #4673
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
merge conflict resolution.
ahsonkhan
added
EngSys
ahsonkhan
requested review from
RickWinter,
antkmsft,
vhvb1989,
gearama and
LarryOsterman
as code owners
This was referenced May 31, 2023
Closed
Jinming-Hu
approved these changes
May 31, 2023
|
Hi @ahsonkhan , storage team has release plan today. I need to hit the merge button to unblock ourselves. |
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.
A clang-format issue got introduced in one of the recent changes to
etag_test.cpp:Looks like these two PRs conflicted with each other, on merge, and caused the double header include for
gtest.h:#4656
#4632
Discovered in:
#4672 (comment)