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

Re: Strange conflicts during merge

From: Christian van der Leeden <lists_at_logicunited.com>
Date: 2003-05-20 15:52:56 CEST

Sorry, this is my typo, it should read:
"merge" instead of "import"
>
> The Folder ppp does NOT exist in http://svn:8080/trunk/safenet
> The merge does point to some conflicts with existing files.
>
Christian

On Tuesday, May 20, 2003, at 03:46 PM, Ben Collins-Sussman wrote:

> Christian van der Leeden <lists@logicunited.com> writes:
>
>> The Folder ppp does NOT exist in http://svn:8080/trunk/safenet
>> The import does point to some conflicts with existing files.
>
> Huh? What "import" are you talking about?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
----------------------------------------------
Christian van der Leeden
Logic United GmbH
Tel: 089-189488-66 Mob: 0163-3747111
www.logicunited.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Tue May 20 15:54:36 2003

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

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