当我运行 git status 命令时,会出现如下内容:
有什么办法可以提交我的工作吗?
$ git status
# On branch assets
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: index.html
# new file: sections
# new file: sections/asset/asset.ctrl.js
# new file: sections/asset/asset.tpl.html
#
# Changes not staged for commit:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# deleted: sections
自从该项目启动以来,sections目录一直存在,所以不确定为什么它会认为这是一个新文件或需要被删除。当我尝试提交时,我收到以下信息:
You have both sections and sections/asset/asset.ctrl.js
error: Error building trees
有什么办法可以提交我的工作吗?