Do not allow approving PRs with a merge conflict #452
Description
Currently, it is possible to r+ a PR even if it has a merge conflict. If that happens, bors should instead return an error.
{{ message }}
Currently, it is possible to r+ a PR even if it has a merge conflict. If that happens, bors should instead return an error.