[linux-elitists] Secure CVS

Joey Hess joey@kitenet.net
Sun Feb 11 15:45:43 PST 2001


Heather wrote:
> Isn't this what CVS is *for*, to handle conflicts during merge?

The conflicts have moved up a step, into conflicts between two cvs
repositories. I was asking if cvsup had the brains to merge two conflicting
_rcs_ files, and I doubt it.

-- 
see shy jo



More information about the linux-elitists mailing list