How does the source control integration perform on Unity when more than one person commits changes to a project. Are projects files mergeable? What happens when conflicts arise?
Thanks
Your options are …
- Buy a license for Asset Server, a Unity Technologies revision control system that integrates right into the Unity editor
- Unity 3.4 or earlier – buy Unity Pro and enable external version control, then check your assets into your version control tool of choice (we’re using git, but there are lots of options); note that binary scenes and prefabs don’t merge
- Unity 3.5 – Unity Free will support external version control; text-based scenes and prefabs should be mergeable
For caveats and best practices around the use of external version control, see answers like this one. Good luck!