[cvsnt] Re: Ignoring binary files on merge

[Gerhard Fiedler]

Nicholson, Eric wrote:

> Does anyone know of a good way to automatically keep the current binary file
> if a merge will produce a conflict, rather than performing the default
> "copy" operation?  I looked at the cvswrappers doc, but  copy" or "merge"
> don't quite do what I want.

Maybe you can somehow place the files you don't want to merge on a
different branch?

Gerhard