Resolving “local delete, incoming delete upon update” Subversion Tree Conflicts
For reason I’m still trying to untangle, I encountered some really terrible conflicts this afternoon with an SVN checkin that didn’t complete properly, leaving me with a few locked directories that wouldn’t respond to “svn cleanup”.
Using these instructions, I was able to get the directories sorted, out:
- Move offending directories out of working copy and to a safe place (e.g. desktop)
- Run svn cleanup
- Run svn up
This actually restored the messed-up directories. Some files were reverted and some deleted files restored; once the entire working copy is cleaned up, you can use the backup copies of the directories …