3 ms·
> Being ruthless with your code means you make commits that fix whitespace, fix indentation, ... --whatever needs to be done, you do it without a bit of regret.
by Peaker 15y ago
> Being ruthless with your code means you make commits that fix whitespace, fix indentation, ... --whatever needs to be done, you do it without a bit of regret.
Given that current tools are not advanced enough to properly merge these kinds of changes, you end up learning not to mess with whitespace/indentation (at least not commit these changes) because it will generate spurious conflicts.
Bad indentation make bugs slightly more likely. Conflicts make bugs much more likely. It's a sad tradeoff to have, but until our tools mature, this is the case.
- jonstjohn 15y agoThis 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.
- Peaker 15y agoMaybe you didn't have lots of topic branches floating above the trunk?