无法git 添加、删除，相关位置也没有文件。我应该怎么办？
Unable to git add, remove, also there is no file in related location. What should I do?
文件未显示在相关位置。
Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# added by them: app/etc/ local.xml~
#
您是否注意到文件名开头有一个 space？执行以下操作之一：
git add "app/etc/ local.xml~"
或
git rm "app/etc/ local.xml~"
文件未显示在相关位置。
Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# added by them: app/etc/ local.xml~
#
您是否注意到文件名开头有一个 space？执行以下操作之一：
git add "app/etc/ local.xml~"
或
git rm "app/etc/ local.xml~"