search

dwyl / dwylbot

:robot: Automating our GitHub Workflow to improve team communication/collaboration and reduce tedious repetition!
28 stars 7 forks source link

Check for merge conflict with awaiting-review #121

Open SimonLab opened 7 years ago

SimonLab commented 7 years ago

When a user add the "awaiting-review" label, dwylbot will report an error if the PR has a merge conflict

iteles commented 6 years ago

A question on this, though it may be a case for a new issue: https://github.com/dwyl/dwylbot/issues

Often it's the case that merging in of a different pull request causes an existing PR (already with an awaiting-review label) to have merge conflicts, despite the fact that it didn't when the PR was originally created. e.g. https://github.com/dwyl/dwyl-site/pull/318

Could we/should we be accounting for this @markwilliamfirth ?

ghost commented 6 years ago

@iteles yes I've made a new issue: https://github.com/dwyl/dwylbot/issues/162