Unity3d Multi-person collaborative development environment build notes (scene merge)

Http://www.cnblogs.com/zhaoqingqing/p/3371120.html

When it comes to multi-person collaborative development, everyone will think of using version control tools to manage projects, of course, the most common is svn and git, but the SVN management Unity3d project does have some undesirable areas, such as: Two people modified the same scene, SVN update can not be merged, And in Unity Editor, SVN is not visualized and unfriendly!

In the early days of our team, we also used SVN to submit and update in our local folder. Record the journey we have come ...

Here's a record of our team's process of using version management tools:

1.SVN Client Management tool, using the original local folder operation

2.UVsersionControl, integrated in the Unity3d interface, easy and intuitive to use SVN features, update,commit,delete ...

This plugin can be asset on the store for free Oh!

Asset Store Address: https://www.assetstore.unity3d.com/#/content/3350

Unity Forum Address: Http://forum.unity3d.com/threads/135247-UVersionControl

But also open source free, oh, strongly top the author!

Note: The command-line version of SVN needs to be installed to use this plugin: This command-line version is consistent with the version of the Tortoise SVN client you have installed! The author recommends 1.7 versions of SVN.

: Windows Subversion command line Client (SVN), historical version downloaded: http://www.sliksvn.com/pub/

Using this plugin also makes it easier to manage projects

3. I think the best version management tool will count Unity's official asset server.

Address: Http://unity3d.com/unity/collaboration

Reference: CSDN Blog: Asset Server U3D Project management

Unity Guide Asset Server (Team License only) Setting up the Asset server

Question: How to control folder access permissions. A: You can manage your project through history and your own Recycle Bin function

Note: When two files collide, you can use compare, merge tool to compare the similarities and differences of two files when you install TORTOISESVN.

Two people modify the same scene, completely stress-free finally get rid of the same scene can not edit the puzzle!

Mac under the Code merge tool:

• SourceGear Diff/merge.
• Filemerge:part of Apple's XCode development tools.
• Tkdiff.
• Perforce Merge (P4merge): Part of Perforce ' s visual Client Suite (P4V).

Common errors:

1, sometimes because the code error, the other person's gameobject settings will not be loaded, prompting you need to solve the code errors, most of the situation is a coding problem, that is, the code has Chinese comments. Need to save the file as UTF-8

2, need to update before commit

3. Merge code files when there is a conflict

Unity3d Multi-person collaborative development environment build notes (scene merge)