There are 3 options to resolve I think for the question 3 options are required
To keep the local file for you, but delete for everyone once they try to pull
git rm --cached <file-name> or git rm -r --cached <folder-name>
This is for optimization, like a folder with a large number of files, The assume-unchanged index will be reset and file(s) overwritten if there are upstream changes to the file/folder (when you pull).
git update-index --assume-unchanged <path-name>
In this option you will tell git that you want your independent version of the file, you don’t want to overwrite production/config files.
git update-index --skip-worktree <path-name>
It will not propagate with git, and each user has to run it independently.