Fix errors setting up levels during rebases and bisects#321
Merged
Fix errors setting up levels during rebases and bisects#321
Conversation
Owner
Author
|
@sahansk2 Would you mind taking a look at this? |
sahansk2
approved these changes
Sep 15, 2020
Contributor
sahansk2
left a comment
sahansk2
left a comment
There was a problem hiding this comment.
Yep, looks good! Just added a [minor] comment about testing.
| file_operator.repo.git.bisect('start') | ||
|
|
||
|
|
||
| def test_reset_during_rebase_conflict(gg): |
Contributor
There was a problem hiding this comment.
Minor nitpick, I'd change the testing to use fixtures instead, but that's not the point of this PR. So, feel free to keep it as it is, if you want.
The level loaded is used for the other levels to base their rebase conflicts off of
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.
During a rebase conflict or a bisect, the head branch would be considered checked out. Since a checked out branch couldn't be deleted, we had trouble setting up new levels during resets/loads/re-inits. This should fix that.
#290 Needs this