In my case, I was able to resolve by updating ("getting latest") on the root of the svn branch.

This was on a Mac using Versions as an svn client.

I've never had to do that before, but it worked in this case.