diff --git a/subversion/libsvn_client/conflicts.c b/subversion/libsvn_client/conflicts.c
index 7d8cd00..0113070 100644
--- a/subversion/libsvn_client/conflicts.c
+++ b/subversion/libsvn_client/conflicts.c
@@ -6135,9 +6135,13 @@
            * the item is gone, which is what we want, so don't treat this as
            * a fatal error. */
           svn_error_clear(err);
-          err = SVN_NO_ERROR;
+
+          /* Resolve to current working copy state. */
+          err = svn_wc__del_tree_conflict(ctx->wc_ctx, local_abspath,
+                                          scratch_pool);
         }
-      else
+
+      if (err)
         goto unlock_wc;
     }