[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Binary update and merge problem

From: Mike Ayers
Subject: Re: Binary update and merge problem
Date: Mon, 09 Dec 2002 10:11:03 -0800
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.2.1) Gecko/20021130

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


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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]