Asset Server and Library(hierarchy) files

Unity Editor Interface
1

Hi guys

I’d like to know if the Asset Server can cope with this situation: me and my buddy are working on the same project, and we both make some changes to the project, the kind of changes that are stored in the library (say, add objects to the Hierarchy, tweak values in the Inspector, etc). When we both want to commit those changes, the latter to commit the changes will get a conflict, and as we can’t merge the files in the library (because they are binary), the only option is to completely overwrite the changes of one of us, losing them. In the long run, that means only one person can make such kind of changes (which are quite frequent) in the project at a time.

This is with regular CVS. Does the Asset Server help to fix this (serious) problem in any way? Does it something special to manage the ibrary? From what I could gather from the documentation, besides the friendly interface it’s not very different from any other CVS.

2

I don’t think the asset server has any special support for merging Unity’s binary files like this.

3

Right, Asset Server does not offer any scene / prefab merging capabilities so have to get a clean workflow. No concurrent editing of the same scene and no concurrent modification of prefabs and imports

4

That’s interesting. I’m curious: so when the scene is checked out it’s locked, therefore other developers would know / be unable to concurrently edit it?

In this case is the rule such that each developer has his own scene and then at some point they are manually integrated into a final scene?

Same for prefabs?

That’s ok if the Asset Server locks the files. I think SVN supports locked checkouts, CVS doesn’t. Perhaps that’s a better approach.