Hello. I use SVN in JDeveloper on my current project and I often experience the same problem.
I have trunk checked out on my PC.
Branching from trunk to implement some complex functionality.
Commit the branch later.
I know there are no changes in trunk.
Open trunk on my PC in JDeveloper.
Team > Subversion > Merge Working Copy
Reintegrate a Branch
URL to Integrate From: http://host/svn/project/branch
Working Copy: D:\mywork\project\trunk
Finish
merge --reintegrate http://localhost/svn/rzdor/branches/Rzdor3_manage_dict D:/JDeveloper-12.1.3.0/mywork/rzdor/trunk2
svn: E195016: Cannot merge into a working copy that has local modifications
Merge completed abnormally.
I have done no modifications in trunk on my PC.
Pending Changes window in JDeveloper is empty.
Cleanup or Update don't help.
What's the reason of this error and how to solve it correctly?
Also I know that I can checkout trunk to another directory and merge will be done with no errors there.
JDev 12.1.3 SVN 1.8