Re: How does CVS concurrently manage binary edits?

[Larry Jones]

Patrick Salsbury writes:
> 
> the question has come up several times: What
> happens if two people edit the same binary file concurrently? 

It works almost the same as with text files -- both people can do
whatever they want in their own sandboxes.  If one of them commits a
change, the other will get an "out of date" error if they try to commit
a change as well.  The difference is that when they then do an update,
CVS won't try to merge the changes; instead, it will issue a message
saying that a merge is required on an unmergable file and give the user
a copy of both versions of the file to merge by hand.

-Larry Jones