Re: Perforce vs CVS

On 26 Jul 2000, Russ Allbery wrote:
> Nick Ing-Simmons <[email protected]> writes:
> 
> > So how does CVS avoid corrupt files when I try and change sv.c from
> > Dallas, Sarathy from Canada, and Graham from UK ?
> 
> One of you gets the change, the other will need to do an update and merge
> and then commit your additional changes.  

That's only if all three of you made changes to the exact same region of
text.  In almost all cases CVS can successfully integrate non-exclusive
changes without requiring a manual merge.  

I can count on one hand the times I've had to resolve a merge manually.

-sam