[OT] SalesForce + CVS

[Dirk Koopman]

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. A "checkout/update", 
>> "develop/fix", "checkin" model. The moment one has more than one 
>> individual/group working on the same unit of code, one needs 
>> coordination and very careful checking in/updating otherwise one get 
>> rapidly into the sort of muddle that you describe. It is very easy to 
>> get into the "he whom commits last - wins" syndrome. Except that it 
>> quite easy for that to become ".. last - trashes the repository" as well.
> 
> 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.