svn update --accept 'theirs-full'
