In my current project, we always insert an empty new line at the end of the Java source files. We also enforce this with CheckStyle (with error level).
We had to do this for some C++ code as the compiler generated a warning about it, and we had a 'no error or warnings' policy.
Maybe the issue lies elsewhere... have you a diffing tool have goes haywire or a merge tool that can't handle it?