Create a test for rebaseBranch (with a basic conflict)
#989
Conversation
This file contains 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
…ethod into GCLiveRepository category
lapfelix
force-pushed
the
smart-rebase-test
branch
from
d0af1c3
to
22f999b
Compare
|
Thanks @lapfelix. The rebasing issues are rather annoying so I appreciate your effort in trying to help out there. I'll be sure to review your PRs this week. |
… and one with multiple commits and conflicts (the last one fails with the current version)
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.
... and move
resolveConflictsWithResolvermethod into aGCLiveRepositorycategory to make that possible (otherwise GIViewController and all of its dependencies would need to be included in the tests and I don't think that's necessary).I'm having daily issues with complex rebases that have multiple conflicts and then leave the working directory dirty once the rebase is done. This doesn't solve them, but it's a first step towards that.
I AGREE TO THE GITUP CONTRIBUTOR LICENSE AGREEMENT