@troyane: You can also do a checkout of "codingstlye" branch into a separate folder and use Meld to copy each code style change. The issue becomes a massive click session then :-)