This kind of depends. At the company I work for we had a wide-range of coding styles for several years, then decided to standardize and run all code that was n

This kind of depends. At the company I work for we had a wide-range of coding styles for several years, then decided to standardize and run all code that was not explicitly excluded through a pre-commit hook to enforce standards. We replaced a significant amount of code using tabs with 4 spaces. I don't remember ever really having a problem with conflicts. May be a setting in your source control software.