Please revert all files with whitespace only changes. The way you can do that in git is with the following command:

    git checkout src/main/java/com/salesforce/phoenix/compile/HavingCompiler.java

Be careful, though, as you don't want to do this for files you've legitimately changed, as it'll revert them without warning.