[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: The idea isn't clear...
From: |
Jim |
Subject: |
Re: The idea isn't clear... |
Date: |
Wed, 28 May 2003 15:24:09 -0700 |
> demand, you might have logical concurrence in different implementations.
> But, is this right? That's the way to work with CVS?
No - actually everyone works on the same branch(trunk)(path?), occasionally
when you go to commit there could be times where someone else has already
commited changes, you'll get a warning about being not up to date, but then
do an update, and cvs'll merge the changes in with the current changes (and
if there's conflicts whcih get marked with
>>>>>>>
stuff
=======
other stuff
<<<<<<<
though I'm not sure whether the top or the bottom is more recent... it's
ususally easy to tell which is the correct one...
branches are more for after having released a version, and after continued
development, you have to go back to the release point and make mods... then
bring that small branch back into the main tree....
>
> Regards,
> Giovanni Giazzon
>
>
>
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs