Comment by joshka

Split the reformatting and real change. Make the reformatting change first and have a policy of merging those change fast.