In Unity Pro I can force all unity files to be in text format, which would enable automatic SVN change merging. But “automatic” means “error-prone” so I would like to know that for sure before I start using it in my big commercial project.
I’m already using SVN for code and assets and that works fine. What I wasn’t able to do so far, though, was having more than one programmer making changes to the scene file (*.unity), as I had it in the binary format which can’t be merged. Today I discovered it can be created in a text format by Unity (brilliant discovery, I know :P) so now I wonder if I can have multiple people working on a scene file, commit each one’s changes independently and then count on SVN to merge the *.unity file correctly.
I’m using the latest Unity version. Does anyone have any knowledge on the matter? Any experience?