Catch and raise merge conflicts #55
Merged
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
jakirkham
force-pushed
the
catch_merge_conflicts
branch
from
621cb73
to
8ca8330
Compare
jakirkham
force-pushed
the
catch_merge_conflicts
branch
from
4d66796
to
8acdb59
Compare
This was referenced Sep 5, 2016
Merged
This was referenced Sep 19, 2016
|
Looks like this needs some tweaks. Please see PR ( #68 ). |
pelson
reviewed
Sep 22, 2016
| @@ -14,6 +14,20 @@ def test_cli_success_bad(self): | |||
| out, _ = child.communicate() | |||
| self.assertEqual(child.returncode, 0, out) | |||
|
|
|||
| def test_cli_success_conflict_ok(self): | |||
There was a problem hiding this comment.
In general please try to avoid these kind of tests where possible - they should be used only if we are unable to ensure coverage through unit testing.
No action needed on this.
There was a problem hiding this comment.
By which you are meaning CLI tests? The main reason I added these was to ensure some uncaught exception wouldn't propagate out. Though maybe we have already covered that case well enough.
This was referenced Sep 22, 2016
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.
Closes #51
This checks to see if a PR will have merge conflicts and raises an error if it does. This should help the occasional confused or git tormented person find their way back to a mergeable PR. It also saves us from linting things when they are in a non-functioning state. After all we would not otherwise know there was a merge conflict. Testing occurs in PRs ( #56 ) and ( #57 ).