git-错误 : addinfo_cache failed for path 'file'

Question

当我尝试将 git 中的任何分支 merge 到 master 中时，我得到了error: addinfo_cache failed for path 'file'。

我的工作:

>git checkout master
>git merge other-branch

Git 给我:

error: addinfo_cache failed for path 'file'
file: unmerged (581c47f7d0e1a0bc825d528d9783ac18ee0cce27)
file: unmerged (26a0c24dccd2bc2f74e20488ca01bba2fcd9cf56)
file: unmerged (3be471ca5c689693339827a455f187814677642f)
fatal: git write-tree failed to write a tree

>git status 产出:

On branch master
Your branch is up-to-date with 'origin/master'.
Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

        both modified:   file

no changes added to commit (use "git add" and/or "git commit -a")

我不知道该怎么做，也找不到有关该问题的任何信息。

Answer 1

当您更改了 core.autocrlf 配置选项但没有删除并重新 checkout 您的工作树时，可能会发生此错误。

因此，要么将 core.autocrlf 改回原来的样子，要么推送您的更改，删除您的存储库并再次克隆它。