我有以下工作树状态
$ git status foo/bar.txt
# On branch master
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# deleted by us: foo/bar.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
文件foo/bar.txt在那里，我想再次使其变为“不变状态”（类似于“ svn恢复”）：
$ git checkout HEAD foo/bar.txt
error: path 'foo/bar.txt' is unmerged
$ git reset HEAD foo/bar.txt
Unstaged changes after reset:
M foo/bar.txt
现在变得令人困惑：
$ git status foo/bar.txt
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: foo/bar.txt
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: foo/bar.txt
#
两个部分中的文件相同，新的还是修改的？我该怎么办？
您做错了方法。您首先要进行重置，以取消登台文件，然后签出，以还原本地更改。
尝试这个：
$ git reset foo/bar.txt
$ git checkout foo/bar.txt
本文收集自互联网，转载请注明来源。
如有侵权，请联系 [email protected] 删除。
我来说两句