-
Notifications
You must be signed in to change notification settings - Fork 242
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
Sl/google test #1726
Sl/google test #1726
Conversation
…ing up-level directory when including header files
…tly; clean up accidentally checked in gtest code from other branche
Merge changes from develop to sl/google_test to keep it up to date
Redo of #1611 refer to that PR for review comments history |
There is no merge conflicts in #1611. I do not see any differences vs this PR either (except one filename -- hello_gtest.cpp vs hello_test.cpp). Therefor I think that the root reason of the issue with #1611 is not known yet. |
CC: @JehandadKhan |
New changes were made on PR1611 after it's tagged as TESTING_CI_PASSED, which seems to causing merge/conflict. This seems to be an issue with the merge process.
Therefore, a new PR is created to include the changes and resolve conflicts if any.