I think this is the key part of git's workflow that improves on older simple versioning systems. the fork and merge model is really needed in other spaces too.
I wonder if it would be possible to turn design files into something textual to leverage git's builtin merge capabilities?
Just ideas that popped into my head looking at this. It's pretty awesome, great job!