I have been working on the deletion of a folder some time.
The file comes up as locked when merging.
I have tried to remove the lock though:
- Team Foundation Sidekicks (does not show the Folder reported as locked by Merge)
- File -> Source Control -> Find in Source Control -> Status (does not show the Folder reported as locked by Merge)
- tf undo itemspec /workspace:workspace;domain\userid (states no pending changes were found)
This is preventing me from merging.
Thanks