title: Cherry Picking in Git
body: <p>I cherry picked a commit, from two years ago and fixed the conflicts (as well as committing the change), but when I try and cherry pick a commit from five months ago:</p>
  <pre><code>$: git cherry-pick 9f73972f3f619f1357269493e01f07c500d61ed9
  
  On branch get_ndt_up_to_staging_branch
  You are currently cherry-picking commit 9f73972.
  
  nothing to commit, working tree clean
  The previous cherry-pick is now empty, possibly due to conflict resolution.
  If you wish to commit it anyway, use:
  
      git commit --allow-empty
  
  Otherwise, please use 'git reset'
  </code></pre>
  <p>How is that true? When I look on github, the commit in question has changes to various files.</p>
  <p>Am I doing something wrong?</p>
  <h2>Edit:</h2>
  <p>When I fixed all conflicts I committed them and attempted to do cherry-pick --continue and it gave me the same error. Did I do cherry pick wrong?</p>