cvs update问题。急问高手,万分感谢!
A B两人,同时修改5.txt文件,此时版本都为1.1,A修改后提交,此时最新版本1.2,B也进行了修改,但和A该的不是同一行,此时commit不成功,故县进行update操作,但update之后并不是两人合并的版本而是A刚刚提交的版本,提示如下
cvs update -P 5.txt (in directory D:\CVSClient\admin\Jackey\)
U 5.txt
cvs server: nonmergeable file needs merge
cvs server: revision 1.3 from repository is now in 5.txt
cvs server: file from working directory is now in .#5.txt.1.2
C 5.txt
***** CVS exited normally with code 0 *****
为何不能merge阿??????