如何结束Git Cherry Pick？ [英] How to Conclude a Git Cherry-Pick?

问题描述

昨天，我挑选了两个提交到我的主要分支，其中一个引发了合并冲突，我解决了他们，承诺并将他们推到了原点。今天，我试图从服务器拉，当我收到以下错误：

  $ git拉
致命：你还没有结束你的樱桃选择（CHERRY_PICK_HEAD存在）。 
请在合并之前提交您的更改。 
 $ 
  

Git状态显示：

  $ git status 
＃在分支主体
＃你的分支在2次提交后落后于'origin / main'，并且可以被快速转发。 
＃
 $ 
  

我尝试了以下方法无济于事：

  $ git cherry-pick --continue 
 usage：git cherry-pick [options]< commit-ish> 
 $ 
  

关于如何解决此问题的任何想法？ c>我意识到这是危险的，因为这不能保证git内部的一致性，但到目前为止我没有问题...

Yesterday I cherry-picked two commits into my main branch, one of them caused merge conflicts and I resolved them, committed and pushed them to origin. Today I am attempting to pull from the server when I get the following error:

$ git pull
fatal: You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).
Please, commit your changes before you can merge.
$

Git status reads:

$ git status
# On branch main
# Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded.
#
$

I have tried the following to no avail:

$ git cherry-pick --continue
usage: git cherry-pick [options] <commit-ish>
$

Any idea on how I could resolve this? Thanks in advance!

解决方案

Solved with the following: rm .git/CHERRY_PICK_HEAD I realize this is dangerous as this doesn't guarantee internal consistency within git, but no issues for me so far...

这篇关于如何结束Git Cherry Pick？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！