Basic usage question

[Wade Williams]

Myself and another programmer are working on a project.  We're working
mainly on different sections of the code.

Day 1:  I checkout the project
Day 2:  I make changes and commit them, and then continue working on my
working copy.
Day 3:  Programmer B makes changes and commits them
Day 4:  I continue working on my working copy, make changes, and commit
them

Now, my understanding of the way CVS works is that this is perfectly
acceptable.  It will merge my changes into the source that's in the
repository, which contains B's changes.  If there were any conficts, it
will alert me and allow me to resolve them.

Is this correct?

Wade