Sometimes files can't be merged by update command in WinCVS
Posted on 2004-08-12
I use WinCVS 1.3 on Windows2000.
I am very new to use CVS.
After I changed some files in my sandbox, I updated before committing them
such as 'cvs update -P filename'
And some merged and conflicted correctly.
But Some files can be merged, even though files are different to files in the registry.
Thre status of files is 'Mod.File'.
I'd like to know what's going on, because now I diff two files and merge by myself
when it happens.