Wanted to merge my branch back into the main trunk today. Haven\'t worked on this project for a week and haven\'t done any commits, etc. in that time-frame. Attempted to do
Hmm... That is odd, but it's a problem in your working copy. I'd abort troubleshooting the svn switch by getting a fresh checkout the trunk. You should then be able to merge the branch into this new working copy.