Merging different types of files

[Reinstein, Shlomo]

Hi,

My CVS project contains two types of files: Text files (source code), and
binary files. The text files contain CVS keywords in them (e.g. $Header$),
and in general we're interested in the keyword substitution feature for the
text files. However, the binary files are stored in the repository with the
"-kb" option, to prevent the keyword substitution and the line-ending
conversions from taking place.

I created a branch (let's call this branch "br") in my project, and now I
would like to merge the changes made on the branch back to the main trunk.
If I do it using:
        cvs update -j br
then I guess "false" conflicts in all the text files about the CVS keywords
(e.g., because the revision numbers on the branch are different from the
revision numbers on the main trunk), and I need to work to remove those
conflicts. On the other hand, if I do it using:
        cvs update -j br -kk
then I don't get the false conflicts about the CVS keywords, but I get
damaged binary files.

What is the right way to merge such a project?

Thanks,
Shlomo