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/
Archive | February, 2012
Recent Comments