Awesome, thanks for the suggestions, @gferreira!
Yes, we are using ufoNormalizer, and that probably is helping. :)
it could even be made automatic by hooking into a fontWillSave or fontDidSave observer
Oh, good idea! I suppose this would be very handy if set up as a startup script for collaborators, as well.
The biggest problems are solved by sorting before committing, so I'll try to hook up the sorting script like this, and report back if there's success.