Hi everyone,
I am using VisualSVN (2.7.3) with JDeveloper (11.1.1.6.0) and am getting the following issue:
commit -m "" C:/JDeveloper/mywork/1_15
svn: Commit failed (details follow): svn: Aborting commit: 'C:\JDeveloper\mywork\1_15\Model\src\com\tke\model\entities' remains in conflict
svn: Aborting commit: 'C:\JDeveloper\mywork\1_15\Model\src\com\tke\model\entities' remains in conflict
Earlier I had tried merging my working copy to restore a prior version (which did not work), and I suspect this is the cause.
Any ideas on how to fix this? The last resort seems to be an export from SVN and a reimport into a new repository.
James