Why not give to your developers an immediate way to reformat the whole source tree before each commit&#x2F;pullrequest, using dedicated tools, like uncrustify, bcpp or AStyle?
Just store the configuration file in the repository, hook the reformat pass to the beginning of your build, and you&#x27;re done.<p>We&#x27;ve been doing this at work for several years ; and we found that this solved nearly every style-related issue (diffs, arguments over which code is &#x27;prettier&#x27;, artificial merge conflicts). It turns out the style  becomes a lot less important issue once you can rely on a tool to apply it for you.
And it also solves the misleading indentation issue (probably by preventing it to happen in the first place by causing a merge conflict).