How to push local changes to phpstorm git server?

Question

git

Hello!
There is a project on the fighting server. I do this:
1. I create a local directory in xamp and do git init in it
2. git remote add origin ssh://[email protected]
3. I download from the server git pull origin master
4 I make changes, I do VCS-> Commit changes
5. Trying to run VCS->Git->Push (CTRL+Shift+K)
and getting error Merge failed
Some untracked working tree files would be overwritten by merge. Please move or remove them before you can merge. View them
+100500 times deleted the .idea folder and did it again.
I can't figure out what the problem is, what am I doing wrong?

Answer 1

Add this folder to gitignore

Answer 2

Have you tried Git -> Add on the project folder?