And they've also improved the merging story, see: http://blogs.unity3d.com/2015/02/17/production-workflow-impr...