2 ms·
This seems like something that could be resolved with a couple of git hooks: post-merge: Reformat code based on local developer preference. pre-commit: (1) Ref
by organsnyder 7y ago
This seems like something that could be resolved with a couple of git hooks:
post-merge: Reformat code based on local developer preference.
pre-commit: (1) Reformat code back to repository standard. (2) Revert changes that are solely whitespace-related.
I'm not aware of a tool that would do the last step automatically, but it doesn't seem like it would be too hard to implement. And perhaps (I haven't checked) git has a built-in config option to alter how it behaves for whitespace-only changes?