[cvsnt] Why is this a conflict?

Glen Starrett grstarrett at cox.net
Fri Jan 16 18:51:42 GMT 2004


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


I think the underpinning theme here is that CVS is not, and should not 
be, a substitute for setting up proper project standards and dividing 
the work to avoid conflicts.  IMHO, conflicting when two different 
developers append to the same file is *entirely* the correct behavior by 
CVSNT.

Now if I can just get my devs to *resolve* the conflicts before 
committing...  (it was a 1 time thing, but very recent) *sigh*.

Flávio Etrusco wrote:

>I agree this would be one more source of problems, but this kind of problem can easily occur without CVS detecting a conflict.
>Say there was a comment or some logging (e.g. "echo Done.") after the "cat". If the first guy places "cd ~" before the logging and the second guy places it after, then it would merge cleanly. Ok, I know this was bit "forced", but I bet someone can think of better examples ;-)
>
>So I wouldn't vote for changing this in the short term, but if someone decides to put together a release to check its "usability" I'm volunteer :)
>
>Regards,
>Flávio
>_______________________________________________
>  
>

-- 
Glen Starrett






More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook