vscode 变基为何卡住？

Question

git commit 记录：

- a1
- a2
- a3
- a4
- a5

git rebase -i a5

删除中间的commit, :wq

然后就卡住了。 尝试几次都这样，请问是这个操作有什么问题吗？

Answer 1

不应该是删掉，若你想合并的话应该把中间三个开头改为 s:

pick a1 信息1
s a2 信息2
s a3 信息3
s a4 信息4
pick a5 信息5

 Rebase a0..a5 onto a0 (5 commands)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit

随后输入 :wq 保存退出