-
Notifications
You must be signed in to change notification settings - Fork 34
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Plugin crashes when pull request has merge conflict #75
Labels
Comments
From your point of view, should it fail the build? |
Yes absolutely, that would be much better indication that something is wrong. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Our private github repo is triggering Strider every time someone creates pull request.
If pull request can be successfully merged everything works well but if there is a merge conflict strider-git module crashes and I'm ending up with forever pending status ( strider-github-status ):
This is where job gets stuck :
Exception is coming from
git fetch origin refs/pull/14/merge
which can't be resolved since there is a merge conflict. Everything goes south on prepare stage:The text was updated successfully, but these errors were encountered: