git - 尝试撤消 rebase 时卡住

Question

在执行两个 Git 命令撤消 rebase 后，我遇到了一些错误。

git checkout topic 
git reset --hard origin/topic

谁能解释这是什么以及如何解决？我不想再次丢失我的代码。

git status 告诉我这个

    Last command done (1 command done):
    pick c326b089c8 Revert "Conflicts removed from master, OffscreenCanvas changes ready for merge" Will rebase branch and resolve conflicts. This reverts commit 7357f2e5444bed9e93e1380331464a5332319d09.
   Next command to do (1 remaining command):
   pick 90bec670b4 Changes reverted in conflicting files. OffscreenCanvas API ready to be merged.
  (use "git rebase --edit-todo" to view and edit)
  You are currently editing a commit while rebasing branch 'testing' on '1b0b63edf9'.
  (use "git commit --amend" to amend the current commit)
  (use "git rebase --continue" once you are satisfied with your changes)

  nothing to commit, working tree clean

提前致谢!

Answer 1

git rebase --abort 将中止 rebase 操作并将您的存储库恢复到开始 rebase 之前的状态。自从你开始 rebase 以来你所做的一切都将丢失。