如何修复 "Unable to unlink old *: No such file or directory"？

Question

我已经从远程存储库克隆了一个分支：

git clone -b feature/feature1 http://.....
git status
    On branch feature/feature1
    Your branch is up to date with 'origin/feature/feature1'
    nothing to commit, working tree is clean

现在我正在尝试使用 git rebase -i 压缩最后两次提交：

git rebase -i HEAD~3

pick ...
pick ....
squash ...

但是，我收到了这个错误：

error: unable to unlink old 'file1': No such file or directory
error: unable to unlink old 'file2': No such file or directory 
error: unable to unlink old 'file3': No such file or directory
hint: Could not execute the todo command
hint:
hint:     squash 3b6cabf2541e333d614c3cd5dbbb82a37037cc14 some commit
hint:
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint:
hint:     git rebase --edit-todo
hint:     git rebase --continue
Could not apply 3b6cabf... some commit

为什么会出现此错误，我该如何解决？

Answer 1

看起来 git rebase --continue 是你想要的。

如何修复 "Unable to unlink old *: No such file or directory"？

How to fix "Unable to unlink old *: No such file or directory"?

git

git-rebase

git-squash