5
我试图恢复提交修改后的文件已被重命名。Git revert创建冲突“由我们删除”,由于重命名
文件的修改曾经被称为bin/internal/call_parser.rb
,目前所谓的lib/call_parser.rb
,并试图做一个还原
$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 16 commits.
#
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: other/unrelated/file
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# deleted by us: bin/internal/call_parser.rb
#
至于我可以告诉以后我得到我的状态,当前的版本lib/call_parser.rb和文件bin/internal/call_parser.br的当时版本应该足够相似,git可以检测到共享内容(我听说git在文件内容上,而不是在文件名上)。如何让git更加努力地检测重命名,并因此恢复到lib/call_parser.rb中的内容?