Last week GitHub announced the upcoming release of the GitHub for Unity extension. Just having a git view embedded into the Unity editor isn't particularly exciting, but the announcement does mention LFS for more efficient handling of large binary files, and file locking to prevent clobbering unmergeable files such as prefabs and scenes.

Neither of those sound like they'll solve the real problems that Unity has with collaborative editing, but it's a nice start.