On Mon, Sep 14, 2009 at 06:59:00PM +0100, Dirk Koopman wrote: > David Cantrell wrote: > >On Mon, Sep 14, 2009 at 04:35:18PM +0100, Dirk Koopman wrote: > > > >>Without getting into religious wars about it, both CVS and SVN are > >>designed for individuals or (very) small teams to be working on one > >>problem at a time on a particular unit of source. > > > >You're talking about merge conflicts? Git doesn't prevent them. > > > No I am talking about nasty CVS simultaneous repository conflicts where > several people have the same code checked out and then check it all back > in separately.
Have you also encountered this problems in a post 1.0 release of Subversion? I assumed you were talking about merge conflicts because CVS and SVN deal with atomicity differently, and you seemed to describe a problem that affects both products. Tom