[z3t4]

I rather work with you then the other guy. If you add your changes using the new style guide, it will look weird and someone will complain. If you rewrite it all, someone will complain because it was a waste of time. Whatever you do, it will be wrong. The solution is to go ask the most senor and respected dev what to do, then redirect to him/her when others complain. =)

[yxhuvud]

I'd create an initial separate commit with only style changes and then have my new or changed code follow the code standard. The code converges very fast if everyone does that.

[Izkata]

Caveat: Try to time it carefully if the code is being actively developed, to reduce risk of merge conflicts and annoyances to the rest of the team. It just leads to a lot of "stop doing that!" and further resistance to that kind of refactoring.

[kronin]

1,000x this. A simple refactor commit, with a comment stating "reformat to match current coding standards. No functional changes".