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

How do you disable merge for certain files?

From: Walter <walterw_at_optonline.net>
Date: 2006-10-11 03:31:02 CEST

I have some Xcode project files that don't like to have their changes
merged. The file itself appears to be XML.

When merged, the project file becomes corrupt and Xcode refuses to open the

Is there a way to disable automatic merge for specific files when doing an


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 11 03:33:39 2006

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.