On 12/8/2010 10:37 PM, Cory Riddell wrote: > Is there some way to tell subversion to merge but ignore externals?
I couldn't find any way to accomplish what I was trying to do. Instead, I removed all the svn:externals properties. It makes setting up a new dev machine more difficult, but it lets me merge from branches, so it's worth it for me. Cory
