Making Changes While Getting Updates

Is this possible? It turns out that it is using the cvs update command. I do not have the space to teach CVS here but here is the basic procedure:

1. Use the CVS features of SourceForge to get a copy of Str.
2. Make your changes. Try to avoid making a lot of cosmetic changes (such as re-indenting), as these will create merge problems later.
3. When you want to merge your changes with the latest, cvs update will do so automatically. If you are simply adding functions, this will happen seamlessly. If you are modifying existing code, there may be some conflicts to sort out. In practice, the cvs update command does an excellent job of merging changes automatically.