version control on large files

Question

We happily use SVN for SCM at work. Currently I\'ve got our binary assets in the same SVN repository as our code. SVN supports very large files (it transmits them \'streamily\

Answer 1

Please be very aware that it is almost impossible to merge binary files! At least automatically. At least I've never heard of a program that supports three-way merging on a binary format. Let alone conflict resolving.

That's why most asset management tools don't have branching, since it makes little sense since you can't merge again. Locking and linear history is better. If you want to "branch", then make a copy of the file with history.