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

Re: Re: Failed to add 'XXX': object of the same name already already exists not working on Tortoise 1.5.0

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Mon, 21 Jul 2008 11:04:02 +0100

2008/7/21 Boldt Sven <Sven.Boldt_at_micronas.com>:
> Hi,
> I've a question to this behaviour. In case a merge is not possible because it's a binary file. This results in a conflict, right? Which status has the file (my private changed file or file from repository) afterwards? Is there a possibility to check the real file contents but trying them out?

If there is a conflict you have to decide whether you want to keep the
local or the repository version. Up until you resolve the conflict,
both versions exist in your working copy with different names (which I
can't remember, but something like .mine and .theirs) so you can try
out both.

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-21 12:04:14 CEST

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