我正在尝试从我的工作目录中删除文件,但在使用以下命令后:
git checkout file_Name.txt
我看到了以下错误信息
error: path 'first_Name.txt' is unmerged
那是什么,如何解决?
以下是我的 git 状态
$ git status
On branch master
You are currently reverting commit f200bf5.
(fix conflicts and run "git revert --continue")
(use "git revert --abort" to cancel the revert operation)
Unmerged paths:
(use "git reset HEAD <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: first_file.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
explore_california/
no changes added to commit (use "git add" and/or "git commit -a")
explore_california
,只需执行rm -r explore_california
,因为它没有被 Git 跟踪。 - brokenfoot