If you have trouble resolving (like me) and you cannot delete and update the resources because you have made many changes on them, plus you are using eclipse subversive instead of native client, follow these steps:
- make a copy of your entire project dir
- perform team>disconnect within eclipse, and choose to delete the svn metadata
- then choose team>share project, and point to the very same folder that your project resides in
- choose yes, and commit everything (you may want to exclude some very local resources, like configuration files)
- if you have deleted or moved some resources prior to your first commit trial, delete those old resources (they should have doubled up, one in old location, one in new) and commit those deletions.
You're done.