I tried to synch my trunk changes into my branch using "svn merge" but subversion says that every single file has a conflict. Most of those files weren't changed in either trunk or branch. I didn't change the directory structure either. What am I doing wrong?

In more detail, I'm in the branch on my computer, at /Users/steve/myproject/nsvbranch. I enter "svn merge <https://myserver.org/users/steve/myproject/trunk>". That's the trunk version of the same directory as nsvbranch; "ls" returns the same files in the two cases. The server takes a little time, and then lists absolutely every single file with a "C" next to it. For several of them, but not all, it asks me how I want to deal with the conflict. In nearly all of the files, including several where it asked me about how to deal with the conflicts, no changes were made in either the trunk or the branch since the branch was made.

I'm clearly making a very simple beginner error, but I can't seem to figure out what it is. Thanks for any help!

-Steve