Go to the previous, next section.
If you work in a group of programmers you have probably often wanted to edit the function realloc() in `alloc.c', but Joe had locked `alloc.c' because he is editing free().
CVS does not lock files. Instead, both you and Joe can edit
`alloc.c'. The first one to check in it won't realize that the
other have been editing it. (So if you are quicker than Joe you wont
have any trouble at all). Poor Joe just have to do cvs update
alloc.c to merge in your changes in his copy of the file. As long as
you changing different sections of the file the merge is totally
automatic. If you change the same lines you will have to resolve the
conflicts manually.
Go to the previous, next section.