info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging in CVS


From: Larry Jones
Subject: Re: Merging in CVS
Date: Fri, 22 Nov 2002 13:18:57 -0500 (EST)

MacMunn, Robert writes:
> 
> Thanks.  Looks like merges must be difficult in CVS.  A lot of manual work.

Only when there are conflicts (i.e., the same line of code separately
modified by two different developers).  In reality, conflicts occur very
rarely.

-Larry Jones

Hello, I'm wondering if you sell kegs of dynamite. -- Calvin




reply via email to

[Prev in Thread] Current Thread [Next in Thread]