In case people aren't aware of it (I only found it recently), check out EditorConfig: http://editorconfig.org http://editorconfig.org It lets you check in an .

In case people aren't aware of it (I only found it recently), check out EditorConfig: http://editorconfig.org http://editorconfig.org It lets you check in an .editorconfig file that specifies whether your project uses spaces or tabs. And a bunch of editors and IDEs already have built-in support for it! Doesn't solve the holy wars, but it can sure help reduce the friction.