This question (How to disable all whitespace autoformatting in Visual Studio 2015?) shows different formatting options when writing in a language - for example C#. But it doesn't cover the problem of everytime I save a file all whitespace is stripped.
This is INCREDIBLY irritating since I can't go into a file an edit just a line of it and commit. I get merge conflicts everytime there is an extra space anywhere in the file.
I don't want VS 2015 to change white space when I save a file. I do want VS to format my code for me...