本文介绍了在试图撤销rebase时陷入困境的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!
问题描述
git checkout topic $ b $在执行两个Git命令来撤消重设资源后,我遇到了一些错误。 b git reset --hard origin / topic
有人可以解释一下这是什么,它怎么样解决?
我不想再失去我的代码。
git status
显示了我这个
完成上一个命令(完成1个命令):
选择c326b089c8还原冲突从主控制器中移除,OffscreenCanvas更改为合并准备就绪改变分支并解决冲突。这将恢复提交7357f2e5444bed9e93e1380331464a5332319d09。
下一个命令(剩余1个命令):
选择90bec670b4在冲突文件中恢复的更改。 OffscreenCanvas API准备好进行合并。
(使用git rebase --edit-todo查看和编辑)
您正在编辑提交,同时在'1b0b63edf9'上重新启动分支'测试'。
(使用git commit --amend修改当前的提交)
(一旦您对变更感到满意,请使用git rebase --continue)
无提交,工作树清理
解决方案
git rebase --abort
会中止rebase操作并在开始rebase之前将您的资源库返回到它的状态。自从你开始变身以来你所做的一切都将失去。
After executing two Git commands to undo a rebase, I am stuck with some errors.
git checkout topic
git reset --hard origin/topic
Can someone please explain what this is and how is it to be resolved ?I do not want to lose my code again.
git status
shows me this
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
Thanks in advance !
解决方案
git rebase --abort
will abort the rebase operation and return your repository to its state before starting the rebase. Everything you did since you started the rebase will be lost.
这篇关于在试图撤销rebase时陷入困境的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持!
10-11 05:51