git rebase出错, 不能continue了, 咋办呢? 很简单:
This happens because when fixing a conflict, you removed all code in the patch beeing applied to the branch you are rebasing on. Use
git rebase --skip to continue.
- 解决: Just do
git reset --soft HEAD^. It moves the HEAD pointer to its parent but keeps the work tree and adds the merge change to the index. So you can continue rebasing with
git rebase --continueas before.