Download SVNTortoise V1.7 and resolve the conflicts there. Most of the time the problem is in the javasources.
Regards,
Ronald