SVN and prefabsconflicts

Question

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.

Answer 1

Best Answer

Answer by Graham-Dunnett · Nov 12, 2012 at 03:22 PM

Don't use binary format for prefabs when using SVN. See http://docs.unity3d.com/Documentation/Manual/TextualSceneFormat.html. Yes, that is a Pro feature.

Add comment · Show 3 · Share

Kryptos · Nov 12, 2012 at 04:09 PM 0

Share

I will work with binary. The only difference is that you cannot see the differences or merge them : you can only chose which version to use. But most of the time, even in text mode merging of prefab is not easy.

Graham-Dunnett ♦♦ · Nov 12, 2012 at 04:31 PM 0

Share

agreed. :-(

hexdump · Nov 12, 2012 at 05:23 PM 0

Share

This is a pity that it is only a pro feature :/.

SVN and prefabsconflicts

1 Reply

Your answer

Welcome to Unity Answers

Follow this Question

Related Questions