我没有看到 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]