Git merge strategy ‘theirs’ is not resolving modify/delete conflict

A bit late but might be useful, you can resolve this type of conflict with:

git merge -X theirs master
git diff --name-only --diff-filter=U | xargs git rm

Basically it means “delete all unmerged files” during the conflict resolution.