I managed to create a little mess in my local git repository. I was trying to fix a broken commit by using the following instructions. Before running the "git commit --amend" (and after the git rebase --interactive) I decided that my changes were incorrect and so I executed "git reset HEAD --hard". Not a good idea, I tell you.
现在,交互式基础似乎被"卡住了".Git将当前分支显示为(| REBASE-m).我的存储库中的每个命令(cd ..,ls,git rebase ...)都会出现以下错误:
cat:.git/rebase-merge/head-name:没有这样的文件或目录
以下是git rebase --abort的样子:
$ git rebase --abort
cat: c:/_work/project/src/git/.git/rebase-merge/quiet: No such file or directory …我试图改变一位同事的工作.
首先,我得到了大量的冲突,其中<<<<<头部接缝包含新代码.
然后过了一会儿我得到以下错误:
fatal: update_ref failed for ref 'refs/heads/dev_504':
cannot lock ref 'refs/heads/dev_504': ref refs/heads/dev_504 is at
XXXXXXX
but expected XXXXXXXX
Could not move back to refs/heads/dev_504
然后,如果我尝试继续,我得到以下错误:
fatal: cannot resume: .git/rebase-apply/final-commit does not exist.
我怎样才能解决这个问题,以便rebase不会出错？
我正在我的本地机器(OS-X 10.10)上进行测试,该机器使用不区分大小写的文件系统(HFS + [CI]) - 当我重置到头部时:
$ git reset head --hard
$ git reset HEAD --hard
和
$ git checkout 4f2c
$ git checkout 4F2C
有完全相同的结果.据我所知,GIT将refs存储在内部,./git/refs但底层文件系统的区分大小写会影响结果吗？
我会在区分大小写的文件系统上获得相同的结果吗？