On Sun, Feb 20, 2011 at 10:11 AM, Daniel Shahaf <d...@daniel.shahaf.name> wrote: > For update, the '--force' switch means "If a local file obstructs an > incoming add, then use that file (and flag the file as > locally-'M'odified) instead of flagging a tree conflict". Have you > tried it? > > P.S. In Subversion 1.7, you can spell that '--accept mf' too :-) > (using the shorthands from the interactive conflict resolution prompt)
Oh, okay. I will try that next time because I got around this problem by `svn add`ing each file and re-trying the update until it finally succeeded.
