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

RE: How to resolve conflict with binary files?

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

Thanks!

>-----Original Message-----
>From: Rob van Oostrum [mailto:rob.vanoostrum@blastradius.com]
>Sent: Monday, October 02, 2006 1:37 PM
>To: Fouts Christopher (QNA RTP PT PREV); users@subversion.tigris.org
>Subject: RE: How to resolve conflict with binary files?
>
>You have two choices:
>
>- keep the incoming version (the one that lives in the place
>you're merging from): run 'svn resolved [filename]'
>- keep the base version of your working copy (the one you're merging
>into): run 'svn revert [filename]'
>
>Hope that helps.
>
>Cheers,
>Rob
>
>> -----Original Message-----
>> From: Chris.Fouts@qimonda.com [mailto:Chris.Fouts@qimonda.com]
>> Sent: Monday, October 02, 2006 1:07 PM
>> To: users@subversion.tigris.org
>> Subject: How to resolve conflict with binary files?
>>
>> 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
>

---------------------------------------------------------------------
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:46:29 2006

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