Re: Binary update and merge problem

[Mike Ayers]

Walter Ghijsen wrote:
> Hi, 
>
> I'm running into problems with merging binary files from one branch 
> into another. 

<SNIP/>

> Does anyone have any suggestions?

	Yes.  Don't merge binary files.  CVS knows how to merge only text 
files.  Binary files you must handle on your own.  What you probably 
want to do is replace the main trunk version of the file with any 
changed files on the developer branch, but you are the expert there. 
You may need to devise a script for this.  The handling of binary 
files in CVS is very limited.


/|/|ike