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

ignore conflict option?

From: Miller, Eric <Eric.Miller_at_amd.com>
Date: 2007-07-11 22:27:25 CEST

Can anyone tell me if there is a way to modify the way conflicts are
handled for particular files?

I have run into a situation where auto-generated binary files are
creating conflicts between working copies. It isn't practical to
require locks on these files and all I really want is to check in
regardless of conflict - whatever is in the working copy wins, more or

Is there a property or switch that I can set that would disable conflict
awareness for some files?



To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 11 22:27:23 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.