My advise would be to use Tortoise to resolve the conflicts. And if there are no conflicts to resolve, then in Tortoise use the option ‘Clean'.
TortoiseSVN can be found here: https://tortoisesvn.net/downloads.html
Manuals can be found here: https://tortoisesvn.net/support.html