CVS does not attempt to merge changes into a file defined as binary.
Right?
So...
Tom <- checksout - binaryBlob 1.1
Dick <- checksout - binaryBlob 1.1
Tom changess binaryBlob 1.1 in his own area.
Dick changes binaryBlob 1.1 in his own area.
Tom commits binaryBlob 1.1 => repository has binaryBlob 1.2
Dick commits binaryBlob 1.1 => NO
<= repository asks Dick to update his binaryBlob 1.1
with 1.2
Dick <- updates - binaryBlob 1.2
QUESTION .... has Dick lost all his changes? What has happened to
Dick's binaryBlob 1.1?? How did CVS update the binaryBlob file in
Dick's area?
What is the solution for this? How do developers working on forms (e.g.
Visual Basic forms , Delphi forms ) handle this situation??
Thanks in advance,.....
aditya
