GIT Resolve Conflict Where File Is Deleted On Local - gecko-8/devwiki GitHub Wiki
Assuming you want the file to stay deleted, simply run the following on the file:
git rm <path to file>
Assuming you want the file to stay deleted, simply run the following on the file:
git rm <path to file>