Watch out for whitespace errors.  I found this with `git diff --check master`.