I am trying to revert a bad merge and get the following: $ svn merge -r 689:687 ...... --- Recording mergeinfo for reverse merge of r689 through r688 into '.': Summary of conflicts: Tree conflicts: 13 svn: E155035: The node '/home/bowing/1-workspace/OC/trunk/latest/resources/images/scheduledPatientList/bmDelete.png' has a status that has no properties.
[user1@devserver scheduledPatientList]$ svn status <<<< where the file located A + C . > local dir obstruction, incoming dir add upon merge D + bmDelete.png Summary of conflicts: Tree conflicts: 1 [user1@devserver images]$ svn status <<<< where the folder located A + C scheduledPatientList > local dir obstruction, incoming dir add upon merge D + scheduledPatientList/bmDelete.png D C worklist > local dir delete, incoming dir delete upon merge D worklist/bmCalendar.png D worklist/bmRefresh.png D worklist/bmSearch.png Summary of conflicts: Tree conflicts: 2 how can I resolve the conflicts? $ svn --version svn, version 1.8.11 (r1643975) compiled Dec 16 2014, 13:31:09 on x86_64-redhat-linux-gnu Thanks,James
