Tell me about Git?

Question

git

Hello! created gitignore:
themes/classic/css/*
files are being changed remotely via ftp in this folder...
Let's say I deleted some file from the locale (themes/classic/views/layouts/main.css), pushed the change... to delete it on the turnip...
when pulling from a server: error: Your local changes to 'themes/classic/views/layouts/main.css' would be overwritten by merge. Aborting.
How to be in this case? I do a git stash, and after that I do a pull, but the files in gitignore(themes/classic/css/*) are updated for some reason, although I don't need it...

Answer 1

First, the themes/classic/views/layouts/main.css file does not match the themes/classic/css/* template. Git warns that uncommitted changes to it will be lost.
Secondly, you probably have ignored files already under Git control, which is why it tracks them.
Need git rm --cached path/to/file.css