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

Re: Completely overwrite a file.

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Wed, 17 Nov 2010 15:43:37 +0200

Stefan Sperling wrote on Wed, Nov 17, 2010 at 14:09:47 +0100:
> Note that you could also use the --accept="theirs-full" option to skip the
> interactive prompt.
>

In trunk, '--accept=tf' (using the shorthands from the interactive
resolver) also works. I've nominated the shorter spelling for 1.6.14.

Thanks for the reminder.
Received on 2010-11-17 14:46:53 CET

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