[cvsnt] Why is this a conflict?

[Jeff Urlwin]

> 
> 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*.

I agree, but: it's hard to do in practice when you have IDEs that
automatically append to files and/or manage shared files, such as
struts-config.xml, applicationresources.properties, foo.jpr, etc.  

We, fairly often, get conflicts in Jdeveloper's Project files (.jpr) when
two people add a new file to the project enven when they are not sharing the
same code (this can happen with Makefiles, etc).  Unfortunately, Jdeveloper,
itself, doesn't make it easy to edit these (or didn't).  A good text editor
does, though -- so it's workable.  The struts stuff, again, is shared
because of the need.  New struts can break out the config files to allow
separation, so some of the "tools" are getting better at this -- but it's a
pain when it happens.

Jeff

> 
> 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
> 
> 
> 
> _______________________________________________
> cvsnt mailing list
> cvsnt at cvsnt.org http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt
>