git - Git 合并说“以下未跟踪的工作树文件将被合并覆盖”但列出的文件被跟踪

Question

我没有看到在 中列为未跟踪的文件git status，甚至尝试修改一个，但它确实显示为已修改git status，因此文件被跟踪。为什么git merge说他们没有被追踪？

如果这很重要，这是一个 git-annex 存储库。

$ git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
    papiers/remcheck/
    "papiers/sant\303\251/"
    photos/android_arno_s10e.bak/

nothing added to commit but untracked files present (use "git add" to track)

$ git merge android_mj_dcim/master
error: The following untracked working tree files would be overwritten by merge:
    photos/android_pro_mj_new/.thumbnails/1598113434562.jpg
    photos/android_pro_mj_new/.thumbnails/1598163462676.jpg
    photos/android_pro_mj_new/.thumbnails/1598163519218.jpg
    [… edited for brevity]
Aborting

$ git ls-files --others --exclude-standard
papiers/remcheck/
"papiers/sant\303\251/Arnaud/DSC_0243.JPG"
"papiers/sant\303\251/Arnaud/DSC_0244.JPG"
photos/android_arno_s10e.bak/AR Emoji camera/20200413_094232.jpg
photos/android_arno_s10e.bak/AR Emoji camera/20200413_094331.jpg
[… other files from photos/android_arno_s10e.bak/ edited for brevity]