Versioning of non-mergable files ?

Hi,

if I have binary files or files which are not mergable (for instance a Rational Rose file: seems to be text, but merging is not possible because of special connections via IDs):
What is the best way to handle such files with Subversion? If developer1 gets a working copy and starts to work and developer2 too (both working on base of the same release) this first who does a commit will win and the second has the problem that he don't know how to get his changes into a new release. Is there any solution for this topic ?

Any advice would be helpful.

Greetings,
Toralf Laue
Received on Tue Nov 16 14:49:13 2004