I tried to ignore the contents.plist for commits, but that resulted in a lot of RF crashes (in hindsight actually expected behaviour since in future pulls there is just no contents.plist and the UFO’s are corrupted). The .glif files however inside the UFO don't produce merge conflicts. So I’m now just resolving merge conflicts by just accepting one version (doesn't matter which one) and then rebuild the contents.plist with your script. So, thanks again!

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.