Resolving SVN conflict after directory rename

Renaming a folder with "svn ren oldname newname" causes a conflict error to occur. I was able to resolve the conflict by issuing the following commands found at http://stackoverflow.com/questions/3941291/a-sane-way-to-rename-a-directory-in-subversion-working-copy

svn resolve --accept working -R .
svn commit