What i mean is we should avoid doing formatting and functional changes at the same time. If you want to format the lines you are changing its totally fine. But when you format the full class it becomes difficult to review. In fact in apache i have been asked to revert formatting changes to lines i did not change. What i recommend is the pull request where we change formatting of the full class should not include functional changes. I dont think git merge will do this unless the changes were locally made.