Git rebase 因在当前分支中发生冲突而无法正常工作

Question

我正在尝试运行 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 是否明智。

Answer 1

我已经尝试过这个，但是运行 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\