Hi,
I recently released two packages I have been working on the past few days:
github.com/skymen/c3merge
github.com/skymen/c3cli
c3merge is a git extension designed to take over merging c3 files to better handle a lot of cases where git fails miserably or merges files in the wrong way.
c3cli is a node library and cli to control C3 headlessly and do simple actions such as opening, saving, previewing and exporting projects.
I will be dogfooding these addons for a long time and improve them as I go, but here they are if anyone wants to play around with them.
Also, if you have a C3 project and have had many merge conflicts, I would love to run some tests on your project to see how well c3merge works compared to git, and if there are any cases I missed.
Btw 
Ashley with something like c3merge, I think most of the remaining issues C3 commonly has with git should be resolved. I think C3 is already doing the best it can to work well with git, but git is very stupid around JSON files, and doesnt have project wide knowledge, so it handles object renames, variable renames and other easy to resolve conflicts really badly. Also it tends to fail and give broken JSON very often which is annoying.