I had git merge conflicts after deleting some files (on OSX) and ran:
git mergetool
After running through most of the conflicts, I accidentally deleted a local file I meant to keep:
Deleted merge conflict for 'app/xxxapp/xxxapp/AppDelegate.swift':
{local}: created file
{remote}: deleted
Use (c)reated or (d)eleted file, or (a)bort? d
Is there any way to recover the file?