Why do you have “actual” changes mixed with tab changes? Delay your current work, do one giant sweep to clear the gap, press it, and then return to your regular programming. Of course, you will encounter several merge conflicts with anything that you worked on before fixing the gaps, but this is inevitable.
source
share