I merged a branch into my current branch, and had a number of merge conflicts. I want to resolve a heap of them by selecting them and right click and select Resolve Conflicts/Resolve Using 'Mine' option.
I get the normal confirmation prompt and when I press OK I get an error message saying:
"Could not update one or more files, please check that no other application is locking your files."
Restarted my PC and opened on Source Tree and tried again, and still get the same error. These are just html files, that are not being used by anything.

How can I resolved this and get on with my merge so I can use my working environment again?

Regards,

Scott