rails日志问题

Question

我该如何解决这个问题并让它停止发生

CONFLICT(删除/修改):在eccc398bb3058c5c0cc9e3587aae93289597fc0f中删除log/development.log并在HEAD中修改.log/development.log的版本HEAD留在树中.

我在.gitignore有

Answer 1

删除并提交.

git rm log/development.log
git commit -m "Removed development log file which was supposed to be ignored."
git push

现在检查并确保您的.gitignore文件设置正确.

touch log/development.log
git add log/development.log

你应该从git中得到这个:

The following paths are ignored by one of your .gitignore files:
log/development.log
Use -f if you really want to add them.
fatal: no files added

如果你没有得到这个,你的.gitignore文件是不正确的.如果你得到了正确的输出,那么某人可以提交日志文件的唯一方法是,如果他们改变了他们的.gitignore(在本地或用其全局覆盖忽略core.excludesfile),或者他们使用-f开关来强制它.