Python, licenses and CVS

[Brent Stroh]

Roy Smith <roy at panix.com> wrote:

>Although we do not enforce it with locked checkouts, we really prefer to 
>work in the "one person editing a file at a time" mode.  If we ever go to 
>check a file back in and discover it's got changes to merge from somebody 
>else's work, we generally consider that a problem, and at the very least, 
>manually verify that the merged changes make sense.

As you should.  CVS doesn't know anything about C++, Java, whatever.  It
merges text files, regardless of the contents.

A tool is not a substitute for a development process, or for understanding
of what a piece of code should be doing.