On Saturday, 17 February 2024 at 22:18, Ilija Tovilo <tovilo.il...@gmail.com> wrote:
> Right. Consistent code style is nice, but what we have now is really > not that bad. There are a couple things I'd want if we enforce code > style: > > * Fixing the style should be easy, running a single command without > first pushing to CI. > * It should be fast too, so that I can easily run it for every commit, > preferably even on-save in my editor. > * The new code style should be applied only to newly added sections or > changed code, not entire files. Otherwise, we'll have many changes in > large files, with endless merge conflicts when merging up from lower > branches. Surely the best way is to apply the formatting tool on all branches that are supported (even in security support). Have them be merged upwards, and then add the revisions of the commits to a .git-blame-ignore-revs file so that git blame doesn't care about them. This should resolve the issue of making future merges difficult. Best regards, Gina P. Banyard
