Something wrong after I commit my merge from a branch to trunk. Now the version
number is 689 and the previous is 687 in the trunk tree.I followed the online
suggestions did the following from my trunk working copy directory:svn up
svn merge -r 689:687 .
and svn up
svn merge -c -687 .
both above give me an error result:svn: E155035: Can't merge into conflicted
node '/locationToAFile/fileName.java'
search online but cannot find direct answer for this. can you tell me how to
resolve above error and let me continue the revert?
Thanks,James
