Hi,
I have been using svn for 2 weeks for unity and there is something I don't understand. Sometimes you make changes to the scene, etc... that produce modifications on the meta file of a prefab and the prefab itself. How do you handle this situation? I can resolve meta file conflicts but what about the binary prefab file? I can't merge changes with the repository :/. Sure I'm missing something, could anyone comment about it?
Thanks in advance.
↧