If you like clean coherent formatted code, you may already use something like clang-format and git hook to ensure format when commit
If you like clean history, you might use a log of rebase.
Sometimes during conflit, format is lost, but it’s pita to fix it afterwards without introducing some commit out of the clean history
I use run-clang-format script with rebase and exec. This will stop rebase if format is not respected
git rebase --exec "./run-clang-format.py -r -i \ --style file --extensions inl,cpp,hpp src/" \ new-base-branch
When it stops, you can examine the situation with
Once everything looks good (in case of conflict, simply use remote, and reformat)
git add -u && \ git commit -m"fix format" && \ git rebase --continue
Then rebase -i again so you can squash/fix all “fix format” commits with their immediate ancestor.
TODO : explain a bit more