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

Re: Resolution of binary files

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-03-09 19:44:53 CET

Chak wrote:
> I am now using the latest version of SVN (1.3.0) and tortosieSVN
> (1.3.2). When there is a conflict in a binary file, it does not ask me
> whether i would like to revert to my copy or the other copy. Is there
> anyway to get it to prompt this for binary conflict s?

No, of course not! If it would ask you as soon as it detects a conflict,
the update/merge/whatever would have to stop there. If you happen to
have several conflicts, that can be *very* annoying.

You can choose which copy (yours or theirs) you want to keep later, just
right-click on the conflicted file entry in the update progress dialog.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Mar 9 19:45:04 2006

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