Currently, if there is a pull request that has merge conflicts and cannot be merged, a reviewer is still able to approve the pull request. This should be disallowed all together until code is pushed that resolves the conflict.

Branch permission should be set up to solve the original problem. However, when that's done, the instructions to resolve merge conflicts will continue to suggest making changes on master, which obviously can't work. The instructions should take branch permissions into account if possible, or if they can't then they should be phrased differently so that they are more likely to work.