如何解决Git rebase无法通过当前分支中的冲突工作
我正在尝试运行git rebase -i,但是git rebase无法在我的控制台上工作。在这里,我给出原因并谈论我的错误吗?
fatal: It seems that there is already a rebase-merge directory,and
I wonder if you are in the middle of another rebase. If that is the
case,please try
git rebase (--continue | --abort | --skip)
If that is not the case,please
rm -fr ".git/rebase-merge"
and run me again. I am stopping in case you still have something
valuable there.
我非常担心,运行rm -fr“ .git / rebase-merge”删除git merge并再次运行git rebase -i是否明智。
解决方法
我已经尝试过,但是先运行git rebase --abort,然后再运行git rebase -i,但是这在控制台中显示,当我尝试键入并且正在使用ubuntu时,没有关键字起作用。实际上,我想在创建分支时删除旧的提交,但必须在其中合并主分支并开始对其进行操作,但是当我创建新的请求请求后,我看到我所有的旧提交都在该分支上。我想删除所有较早的提交。
hint: Waiting for your editor to close the file...
pick ba518d16 all linting correction done
pick 1aaec497 correction and circleci linting done
pick 469909fc fixing linting correction done
pick 0c34faa1 removing unrelated changed 1
pick 97d21359 removing unrelated change: 1
pick dee76486 issue fixing: 2
pick 05d1ce18 fixing and correction : 2
pick a7b4691b issues correction : 2
pick 73251bfe correction: 3
pick 50735a79 correction: 6 and linting fixing
pick 995ab4e5 trackthread file correction done
pick c9f13687 receive profile file correction
pick 30c14bd7 correction: 1
pick 9ba82155 correction: 2
pick 75764831 working with to navigate and zoom by double cli\
cking
--**-Mg: git-rebase-todo (fundamental)----To\
版权声明:本文内容由互联网用户自发贡献,该文观点与技术仅代表作者本人。本站仅提供信息存储空间服务,不拥有所有权,不承担相关法律责任。如发现本站有涉嫌侵权/违法违规的内容, 请发送邮件至 dio@foxmail.com 举报,一经查实,本站将立刻删除。