Install Turtoise svn (1.7) and do a cleanup. Then check if you still have conflicts and resolve them. Then do a svn commit. After that you can commit from Mendix again.
Regards,
Ronald
Cheers Ronald.
Unfortunately we do not maintain the SVN inhouse and we use mendix cloud for admin overhead reasons.
I did try some other way too and it seem to have worked.
I had a project backup taken and I over wrote the folder which has the conflict with that file and tried to re-open, it was searching for an empty folder, but i configured that too and now it seem to work.
Thank you for your help.
Best Regards Nimesh