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
I was switching from a branch to trunk and just got the same error.
With TortoiseSvn, I was able to do a "Clean Up" and that fixed the issue for me.