pioneerspacesim/pioneer — pull request #1334 by johnbartholomew (2012-07-04 20:07:09+00:00)
Title: Strip trailing whitespace

Changes:

* A couple of files (Color.cpp and Light.cpp) have had a final newline added. It's not actually necessary, but it's quite common; all the other source files already had a final newline.
* Light.h and Light.cpp have been converted to unix line endings.
* Trailing whitespace (tabs and spaces) has been removed from all files under src/, all files under win32/src/, all Lua files under data/, all files under data/lang/ and all files under data/shaders/.

Obviously this touches a lot of files. I would like to get the opinions of all active devs as to whether it is worth doing this, since it's likely to create merge conflicts, and whether it's worth including any other global code formatting clean-up (e.g., normalising indentation style) at the same time.

My opinion is:

I have very few active branches (nothing really big), so I don't expect this to cause real merge conflict problems for me. For me, I think the potential conflicts are worth it. There have also been some changes in the past that have touched a lot of files and I can't recall hearing any complaints from that. However, I'm aware that some devs have larger work going on (new-ui, new-model), and that some devs have much less experience with git which may make conflicts more problematic for them. I have a very mild preference to normalise indentation at the same time.