Re: How to disable automatic merging...

On Mon, 10 Dec 2007 12:02:25 -0700, Gus Hart wrote:

> but alas this doesn't work. I still get the dreaded "G" tag when
> updating. I have a feeling that somehow the config file is being ignored
> as changing the "editor-cmd" value didn't change anything either...

Are you sure you really don't want SVN to merge when you svn up a file
you have changed? I'm not sure I understand why. If you don't want
another developer's changes to mess up your work, use branches.

-- 
Sohail Somani
http://uint32t.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org