| |
We'll look at exactly how conflicts can be resolved in just a little bit, but
for now, let's assume that there are no conflicts after you typed "cvs update
-dP" -- there usually aren't. With no conflicts, your local sources are
up-to-date, and you're ready to commit your changes to the repository by typing
the following command in your main source directory:
# cvs commit
|