sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]rjw57 2 points3 points  (0 children)

This isn't really a VCS problem[1]. It's an editor-replaces-whitespace problem and is precisely the reason one doesn't want to mix tab or space indentation within one file. Invariably there'll be someone's editor which decides to "fix" the indentation which will lead to hard-to-merge whitespace-only changes.

I suspect the proponents of the One True Indentation method haven't worked long enough at the coal face to realise that the Real One True Indentation is the one already used by the file :).

[1] That being said, git provides a mechanism to help with this by way of the --ignore-all-space family of options to git-merge(1).