Git merge says “The following untracked working tree files would be overwritten by merge” but the files listed are tracked

Question

I don\'t see the files listed as untracked in "git status", and have even tried to modify one and it does show up as modified in "git status", so the fil