How to resolve “local edit, incoming delete upon update” message

Question

When I do a svn status ., I get this:

!     C auto-complete-config.elc
      >   local edit, incoming delete upon update
!  +  C auto-complete.el         


        

Answer 1

Try to resolve the conflict using

svn resolve --accept=working PATH