title: How to Conclude a Git Cherry-Pick?
body: <p>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:</p>
  
  <pre><code>$ git pull
  fatal: You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).
  Please, commit your changes before you can merge.
  $
  </code></pre>
  
  <p>Git status reads:</p>
  
  <pre><code>$ git status
  # On branch main
  # Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded.
  #
  $
  </code></pre>
  
  <p>I have tried the following to no avail:</p>
  
  <pre><code>$ git cherry-pick --continue
  usage: git cherry-pick [options] &lt;commit-ish&gt;
  $
  </code></pre>
  
  <p>Any idea on how I could resolve this? Thanks in advance!</p>