Source control

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

asked Feb 03 '12 at 01:22 AM

Cthutu
3 ● 3 ● 4 ● 8

Are you asking about Asset Server or external version control?

Currently most files in Unity are binary files and subsequently cannot be merged.

Feb 03 '12 at 01:28 AM kevork

I mean external, like perforce. So Unity cannot be used well with large teams?

Feb 03 '12 at 03:55 AM Cthutu

(comments are locked)

1 answer:

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!

answered Feb 03 '12 at 06:22 AM

yoyo
6.4k ● 25 ● 39 ● 84

(comments are locked)

Your answer

Follow this question

By Email:

Once you sign in you will be able to subscribe for any updates here

By RSS:

Answers

Answers and Comments

Topics:

source-control x13

asked: Feb 03 '12 at 01:22 AM

Seen: 852 times

Last Updated: Feb 03 '12 at 06:22 AM

Community

Source control

Follow this question

Welcome to Unity Answers

Unity Answers tutorial video!

Related Questions