Diff tools for merge conflicts?


not exactly a scripting question, but what tools do you use for resolving .glyphs file merge conflicts? Normally I am very satisfied with using opendiff, but a recent project has files with ~300k lines, so the merge tool becomes very sluggish to use. Are any of you having similar problems and what have you used to work on merge conflicts with files that size?


(Also, if anybody has a reasonable approach to automating merge conflict resolves for last updated, display strings and glyphs version that would be neat :wink: )

When I find some time I like to make ‘MergeGlyphs’ to act like a conflict resolver. That might help a bit.

I was looking into that, yes, that would be a great help, too! Is there a way to pass two files in by calling the app from the CLI?