When resolving an edit/delete conflict while merging, when attempting to resolve the conflict by accepting the 'deleted' side, SourceTree throws the error "Could not update one or more files, please check that no other application is locking your files".

The problem is not that the file is in use, but that it does not exist - SourceTree should just mark the issue as resolved in the staging area and leave the file deleted.

Here is a detailed reproduction scenario on SourceTree 3.0.17 for Windows, completely from scratch:

1. Create a (local) repository
2. Commit a file 'test.txt' (empty) into the master branch
3. Create branches 'a' and 'b' from master
4. In branch 'b', edit test.txt by entering some text in it, then commit. Make sure to close the text editor.
5. In branch 'a', delete test.txt and commit
6. Merge branch 'b' into 'a'. This reports a conflict on test.txt (edit/delete conflict)
7. Attempt to resolve the conflict by on the "File status" tab, right click the conflicting file, resolve conflicts, resolve using 'mine' (i.e. the 'delete' should win).
8. Click OK to the prompt on resolving to the state as of the mentioned commit
9. Observe the error prompt "Could not update one or more files, please check that no other application is locking your files".

This issue was previously reported 5 years ago on version 1.6.5 in https://jira.atlassian.com/browse/SRCTREEWIN-2366 and is as valid today as it was 5 years ago. I'm opening the issue as new as advised by Michael Minns in that thread.

Marked "High" because this blocks normal workflow and another Git client has to be used to get out of the situation.