标题可能对事物的解释有点奇怪，所以我将在这里更详细地介绍。
我已经通过 github 为网站设置了 git repo，因此我们所有人都可以在自己的计算机上进行编辑，然后将更改推送到网络服务器。然后我的网站上有一个拉脚本git pull --rebase，如果 repo 有变化，每隔几分钟就会执行一次。
现在，我不希望在 github 上有数据库的用户名和密码，所以我想在服务器上本地有一个 .htaccess 文件来保存用户名和密码，而不是在 php 文件中。因此，我在本地创建了一个 .htaccess 文件，并在 gitignore 和 gitattributes 中添加了 .htaccess，但每当我执行此操作时，都会git pull --rebase删除对 .htaccess 文件的更新。如果我这样做git rm .htaccess并且git status它说 .htaccess 已被删除并且我必须将文件推送到 repo，即使 repo 没有任何 .htaccess 文件。而且我也不能推送，因为 repo 的服务器版本是只读的。
有任何想法吗？
使用 .gitignore 文件更新：################# ## Eclipse ################
*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# CDT-specific
.cproject
# PDT-specific
.buildpath
#################
## Visual Studio
#################
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
*.suo
*.user
*.sln.docstates
# Build results
[Dd]ebug/
[Rr]elease/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
.builds
*.dotCover
## TODO: If you have NuGet Package Restore enabled, uncomment this
#packages/
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
# Visual Studio profiler
*.psess
*.vsp
# ReSharper is a .NET coding add-in
_ReSharper*
# Installshield output folder
[Ee]xpress
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish
# Others
[Bb]in
[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
############
## Windows
############
# Windows image file caches
Thumbs.db
# Folder config file
Desktop.ini
#############
## Python
#############
*.py[co]
# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
# Installer logs
pip-log.txt
# Unit test / coverage reports
.coverage
.tox
#Translations
*.mo
#Mr Developer
.mr.developer.cfg
# Mac crap
.DS_Store
#################
## Project specific
#################
# Ignore htcaccess so so pwd is not public
.htaccess
# Ignore the pull script because this is only for the server
pull.php