[cvsnt] Merging and Binaries

[Gerhard Fiedler]

Arthur Barrett wrote:

> CM best practice suggests that these things should be controlled
> separately rather than letting the client decide - which is why CVSNT
> has the "ignore client side -k options" server side setting. 

Do you mean that all -k options should be defined by the server-side
cvswrapper file?

> Binary files cannot be "automagically" merged by CVS/CVSNT.  So the
> "new" and "old" files are put in the sandbox so you can use a vendor
> supplied tool for performing the merge (eg: MS Word). 

I think part of the question was why cvsnt doesn't mark them as conflict
files. It seems to me to be a conflict situation (that is, "merge required
but not possible").

Gerhard