# if the file in the right place isn't already committed: git add <path to desired file> # remove the "both deleted" file from the index: git rm --cached ../public/images/originals/dog.ai # commit the merge: git commit
