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

If you haven't made any changes inside the conflicted directory, you can also rm -rf conflicts_in_here/ and then svn up. This worked for me at least.