|
We begin to use Subversion, and there are many conflicts in the Library directory. We only added .asset files but many of them meet conflicts during commit and updates. how to avoid it ? Is it really important to commit .asset. ? the MonoManager for instance meet a conflict every time. Thanks in advance
(comments are locked)
|
|
This should answer your question: http://unity3d.com/support/documentation/Manual/ExternalVersionControlSystemSupport.html There's a lot of stuff in the Library folder that you shouldn't version.
(comments are locked)
|
|
Where is the External Version Control Support in Unity Pro iPhone Advanced? I see Edit -> Project Settings but not the -> Editor. I assume this is someplace else? Also, following the above link (ExternalVersionControlSystemSupport.html) regarding the Library folder not being included: Well this (for me) results in Missing links in the Scene - that is, the assets will still be there but the Inspector shows the assets to be "Missing" and the links have to been entered again in many - but not all places (as if the cache/meta folder were holding some of the scene information in addition to the *.unity scene). Very weird stuff. Basically, I am finding a lot of problems with svn and Unity - just my experience, for what it's worth. So, I would love to hear from anyone else regarding solutions to this since the docs don't seem to be working in this area - at least for me. External VCS is not yet supported in Unity iPhone. Until we release a version of Unity iPhone with External VCS support, the only convenient way to version an iPhone project is using the Unity Asset Server.
Jan 25 '10 at 09:10 AM
jonas echterhoff ♦♦
Thanks for the info Jonas. I've been "getting by" through a series of zips, DifMerge, and using package import and export when things get too weird. Saving and restarting Unity for iPhone every hour or so, is also a recommended practice in my experience.
Feb 19 '10 at 09:52 PM
mcroswell
(comments are locked)
|
|
Well if you wanted to resolve the conflicts, then check this out: http://www.duchnik.com/tutorials/vc/svn-conflicts
(comments are locked)
|
|
We version control everything in SVN, but SVN cannot merge binary files which makes things tricky. You'll have to rebuild stuff in some cases to manually merge work.
(comments are locked)
|
|
Have you enabled "External Version Control Support"? You'll find the setting under Edit -> Project Settings -> Editor.
(comments are locked)
|
