Add unit test for resolveConflicts function#5233
Merged
alvinlin123 merged 2 commits intocortexproject:masterfrom Mar 31, 2023
Merged
Add unit test for resolveConflicts function#5233alvinlin123 merged 2 commits intocortexproject:masterfrom
alvinlin123 merged 2 commits intocortexproject:masterfrom
Conversation
Signed-off-by: Doğukan Teber <[email protected]>
dogukanteber
commented
Mar 27, 2023
friedrichg
requested changes
Mar 29, 2023
Signed-off-by: Doğukan Teber <[email protected]>
friedrichg
approved these changes
Mar 31, 2023
alvinlin123
approved these changes
Mar 31, 2023
yeya24
pushed a commit
to yeya24/cortex
that referenced
this pull request
Apr 28, 2023
* Add unit test for resolveConflicts function Signed-off-by: Doğukan Teber <[email protected]> * Clean up the test logic Signed-off-by: Doğukan Teber <[email protected]> --------- Signed-off-by: Doğukan Teber <[email protected]> Signed-off-by: Ben Ye <[email protected]>
alexqyle
pushed a commit
to alexqyle/cortex
that referenced
this pull request
May 2, 2023
* Add unit test for resolveConflicts function Signed-off-by: Doğukan Teber <[email protected]> * Clean up the test logic Signed-off-by: Doğukan Teber <[email protected]> --------- Signed-off-by: Doğukan Teber <[email protected]> Signed-off-by: Alex Le <[email protected]>
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
3 participants
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.
What this PR does:
This PR adds unit test to
resolveConflictsfunctionWhich issue(s) this PR fixes:
Fixes #5079
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]