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

Re: Ignore conflicts

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-08-09 14:11:02 CEST

On Sun, 2004-08-08 at 21:01, Tom Eastman wrote:

> Is there any way to prevent 'svn' from generating the 'file.r??' stuff when
> there's a conflict and just always overwrite the original file?

No, Subversion will absolutely, never-ever destroy local modifications.
As Jacob said, perhaps you need a tool like rsync.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 9 14:12:48 2004

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