SVN Issue - "local delete, incoming edit upon update"

SVN update shows this message and not able to commit any files.

$ svn update
 
  C app/model/User.php
      >   local delete, incoming edit upon update

$ svn commit
 
  svn: Commit failed (details follow):
  svn: Aborting commit: remains in conflict

We may reslove this issue by following steps.

  1. Take backup of the files which we modified and newly created file in SVN tree.

  2. $ touch app/model/User.php

  3. $ svn revert app/model/User.php

  4. $ svn status

    ? app/model/User.php
 
  5. Do your update on that file from backup

  6. Commit it with out conflict
 
  I hope above steps slove this issue