svn: how to resolve “local edit, incoming delete upon update” message

svn_resolve.md

svn: how to resolve “local edit, incoming delete upon update” message

$ svn st
!  +  C foo
      >   local edit, incoming delete upon update
!  +  C bar
      >   local edit, incoming delete upon update
$ touch foo bar
$ svn revert foo bar
$ rm foo bar

If the conflict is about directories instead of files then replace touch with mkdir and rm with rm -r.