Git Merge and Fixing Mixed Spaces and Tabs with two Branches

Question

I\'ve gone through some similar SOQ\'s and have not seen an adequate solution for this case.

I\'ve noticed that in many files there is a dirty mix of tabs and spaces

Answer 1

Assuming you have at least three branches (say 'master', 'team1', 'team2') then update the 'master' branch with all of the correct spacing/indenting and have each team pull in the changes from 'master'. Each team should then ensure all of their new code/files meet your standard coding practice.