The file was changed locally, now when committing, no changes are made to this file, how to fix it painlessly?

Question

git

A very unpleasant situation arose. Inexperienced manipulations via ftp uploaded a file to the project server (changed the existing one), which is associated with a remote repository. When the project is spooled, nothing happens when changes are made to this file. Tried to do __reset --hard comit(last before file change)__. The file also did not want to be committed to the server, all changes are naturally made in the repository. How to fix this error? I would experiment myself, but there are fears to break everything to hell. And 2 more people work with this repository. I would be grateful for the help, since I'm not very savvy in the git yet.

Answer 1

Do git checkout /path/to/file