Re: cvs update not handling binary files with conflicts correctly

[...] When the update command is run it says that there is a conflict in the WORD.tar (binary file). But when I ran cvs -nq update after the changes are merged it shows that the Binary file has no conflicts. It is supposed to mark it with a 'C' right? CVS already told you... $ cvs -f up -d -kk -j T

cvs update not handling binary files with conflicts correctly

I have two files with conflicts. One a binary file and another an ASCII file. Binary file: WORD.tar ASCII file: test9.txt - # Before merge $ cat CVS/Entries | egrep 'WOR|test9.txt' /WORD.tar/1.1.4.2/Fri Apr 8 20:17:35 2005/-kb/TMY_BRANCH /te