title: Git ammend not allowed after resolving cherry-pick conflicts
body: <p>I <code>cherry-picked</code> a commit and resolved the conflicts, added them, now when I try to do git amend it fails with below message. </p>
  
  <blockquote>
    <p>fatal: You are in the middle of a cherry-pick -- cannot amend.</p>
  </blockquote>
  
  <p>Why does git gives this message, is there a way to tell it things are fine?</p>