localhost:web xxxx$ svn resolve --accept working ~/Desktop/MyWork/web localhost:web xxxx$ svn revert ~/Desktop/MyWork/web