Now, when I run "cvs update -dP" (as you should before every commit), cvs isn't able to merge his changes into my local copy of ChangeLog because we've both added lines to the exact same part of the file -- how is cvs to know which version to use? So, I get the following error from CVS:

RCS file: /home/cvsroot/gentoo-x86/ChangeLog,v
retrieving revision 1.362
retrieving revision 1.363
Merging differences between 1.362 and 1.363 into ChangeLog
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in ChangeLog
C ChangeLog