Git warning of file overwriting due to (supposedly) untracked files

Question

Attempting to pull from git repo, but getting the following output. I think these files are tracked (As they should be), but its indicating that they are not. They are not i

Answer 1

So it seems a scenario for this problem is when a file has been deleted and you still have a copy of it. For some reason, git fails to understand it.

None of these suggestions worked for me.

Finally I could fix it by git rm filename, git commit -m "temporary commit", then git pull --rebase.

At this point, git complained again and then I had to add the file to be tracked by git add filename, git commit -m "temporary commit2", then git pull --rebase.

Then everything went well. And I do not see my temporary commits as they cancel out each other.