Subversion Question

[tmiranda]

Warning, I know little to nothing about subversion.

I'm using NetBeans as my Java IDE and I've recently starting getting this error when I try to commit my changes to a repository that I have setup on google code:

org.tigris.subversion.javahl.ClientException: Merge conflict during commit
svn: Commit failed (details follow):
svn: File or directory 'src\tmiranda\podcastrecorder\API.java' is out of date; try updating
svn: resource out of date; try updating


The SVN command returned with an error which indicates that some files in your working copy are out of date.
Run update and attempt your command again.

I think it's telling me that API.java is newer on google code than it is on my development machine. I don't know how it could be, and it shouldn't be. How do I get things back in sync? I tried "update" but that really messed things up by putting strange files ending with "mine" into the source tree.

The version on my development machine is the most recent version.

[tmiranda]

I found the answer to my question. I had to rename the .mine files to .java, tell subversion that I had resolved the issues, and then commit the changes. Hopefully I didn't botch anything!