danmar/cppcheck — comment on commit 6f8e42a5af300db263e74895c8cbdc13769332ba
File:  line 0
By danmar:

yes this can cause merge conflicts. But isn't this relatively simple to handle? If I did this manually it would be lots of trouble.

If your work is compatible with the previous commit. Then you should be able to use the runastyle scripts from this commit to update your work.