-
Update your local working copy(svn update)
-
Make changes (svn add, svn delete, svn copy, svn move)
-
Examine your changes(svn status, svn diff)
-
Possibly undo some changes (svn revert)
-
Resove conflicts ( svn update, svn resovle)
-
Commit your changes (svn commit)