by Mukul on February 2, 2012 in Uncategorized
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/
One Response to “Resolving SVN conflicts: LOCAL DELETE, INCOMING DELETE UPON UPDATE”