Open
Conversation
arthanson
requested review from
a team and
jnovinger
and removed request for
a team and
jnovinger
arthanson
requested review from
a team and
jeremystretch
and removed request for
a team
Contributor
|
@arthanson please address the CI failures and re-request a review once completed. Thanks! |
arthanson
requested review from
a team and
jeremystretch
and removed request for
a team
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
2 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.
Fixes: #431
Created a BaseMergeTestCase that has common merge test classes in-case new merge strategies are added in the future. Merge specific tests cases are in squash merge as there are some extra test cases that are specific to that merge strategy. Added some tests for:
Note: Looks like tests reveal a bug in the cable pathing when doing squash merge so that test is disabled right now in squash, will file a separate bug report for fixing the underlying issue and re-activating the test for squash merge.