In my local repository, I have a modified settings file with a different version of the file stored on GitHub. Whenever I pull from GitHub into my local repository, my local copy gets changed.

Is there any way to avoid having my local copy overwritten by git-pull?

git github gitignore git-pull
Edit
Report