Here’s an excellent post on resolving this type of conflict: http://triopter.com/archive/resolving-local-delete-incoming-delete-upon-update-subversion-tree-conflicts/
Hits From The Blog
Resolving SVN conflicts: LOCAL DELETE, INCOMING DELETE UPON UPDATE
by Mukul on February 2, 2012 in Uncategorized
WordPress – Simple coming soon plugin
Disabling the Simple Coming Soon plugin for WordPress Simple coming Soon is a pretty nifty plugin by Mario Kostelac that allows you to display a nicely formatted ‘coming soon page’ with a timed countdown indicating the time remaining for the site to be launched. I found it immensely useful while upgrading my site. The installation [...]
by Mukul on September 29, 2011 in Troubleshooting
Follow Me!
Follow @mukulhinge on Twitter





