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

Re: Two people adding the same file - can both versions be merged?

From: christian unger <christian_unger_at_mac.com>
Date: 2007-05-16 15:53:57 CEST

On 14.05.2007, at 21:01, Ryan Schmidt wrote:

>
> On May 14, 2007, at 06:50, christian unger wrote:
>
>> since the svn switch is a subset of svn merge,
>
> It isn't. "svn switch" is a superset of "svn update".
>

Oops you're right, but this doesn't necessarily render the proposed
solution useless, does it?

:-)

cu
christian unger

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 16 15:54:26 2007

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.