SVN "local unversioned, incoming add upon update"

Problem

$ svn st -q
D     C dir
      >   local unversioned, incoming add upon update
D       dir/file

Solution

$ svn resolve --accept working dir
Resolved conflicted state of 'dir'
$ svn revert dir
Reverted 'dir'
$ svn status
D       dir/file
$ svn revert dir/file
Reverted 'dir/file'
$ svn st -q 

Reference

• http://tomhennigan.blogspot.co.uk/2012/01/resolve-tree-conflict-svn-local.html