controls@rosalba:/users/rana/docs 0$ svn resolve --accept working nancy Resolved conflicted state of 'nancy'