Revert "Merge branch 'master' into 'feature/master/sra-identity-auth`… #4051
Conversation
This file contains hidden or 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
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.
… (#3910)"
This reverts commit 005b39b.
Motivation and Context
The previous merge in #3910 was merged using
Squash and mergeon the UI, instead of pushing from command line, causing new merge attempts to have lots of conflicts.Modifications
To fix that, reverting the previous merge. Ran
git revert 005b39b4deb2825b0e9639c31ba677d5db66797dand resolved few conflicts in import statements.