[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

How to resolve conflict with binary files?

From: <Chris.Fouts_at_qimonda.com>
Date: 2006-10-02 19:06:45 CEST

I get conflicts when merging binary files and I try to
resolve them using tkCVS (with SVN support), and it does
NOT do it at all. How can I resolve conflicts with binary
files?

--------------------------------------
Chris T Fouts
Qimonda NA
3000 CentreGreen Way
Cary, NC 27513
Phone: (919)677-3016
Fax: (919)678-1929
Email: chris.fouts@qimonda.com

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 2 19:07:31 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.