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

Re: User-specific "do-not-merge" for certain file types?

From: Troels Arvin <troels_at_arvin.dk>
Date: 2006-08-25 11:22:57 CEST

On Fri, 25 Aug 2006 11:12:34 +0200, Stefan Küng wrote:
> That won't prevent Subversion from merging the files on an update! The
> setting you're referring to is only for TortoiseSVN to resolve conflicts
> or show merges.

The user _never_ uses command-line Subversion. So in that case, it should
be OK, right?

-- 
Greetings from Troels Arvin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Aug 25 11:21:18 2006

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