Resolving “local delete, incoming delete upon update” Subversion Tree Conflicts
NOTE: I’ve noticed a lot of traffic to this page for “local edit incoming delete on update” errors, which are not what this article is about (the solution below may or may not work for that — I have no idea). This article is about “local delete, incoming delete on update” errors. Always back up your work before you muck around with something like this, but that goes doubly if you’re going to try to use these instructions for the “local edit” error.
For reason I’m still trying to untangle, I encountered some really terrible conflicts this …