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\