git pull
报错信息
error: The following untracked working tree files would be overwritten by merge:
Client/Scripts/Gui/Admin/person.js app/admin/person.jsPlease move or remove them before you can merge.
翻译:
错误:以下未跟踪的工作树中的文件会被合并被覆盖:
文件路径:Client/Scripts/Gui/Admin/person.js
app/admin/person.js
请移动或删除它们,然后才能合并。
解决办法:
命名tongming