Restore changes that were overwritten by git pull
This question already has an answer here:
Git pull deleted uncommitted changes
One Solution collect form web for “Restore changes that were overwritten by git pull”
As mentioned in the question, a solution I used to restore my changes was using git’s lost-found.
cd .git/lost-found/other/ to take myself to the lost and found where the files were.
I opened each file in the directory to see what it’s name was, then moved it to the correct directory with the correct name.
git add to add the changes and commit them, so now I won’t lose them again.