Re: Wat in the heck is wronfg with cvs?

[Tyler A. <ty...@bo...>]

>> I had that same problem with CVS -- it is where you modified a
>> particular line, then someone else modified the same line (probably me).
>> One person submits it before the other.  The second person updates their
>> copy.  CVS is confused and notices that you altered that area.  It shows
>> you what the new code is (the code in the CVS) and what your code looks
>> like.
> OK are you going to fix it or am I?

You are, since it is only in your copy.

-- 
Tyler Akins                    ty...@bo...