title: I merged a commit into master and am now getting a message about cherry-picking. Would appreciate advise on what is safe to do
body: <p>Here's the status of my GitHub files:</p>
  
  <pre><code>$ git status
  On branch master
  Your branch is ahead of 'origin/master' by 2 commits.
    (use "git push" to publish your local commits)
  
  You are currently cherry-picking commit 41a0584.
    (all conflicts fixed: run "git cherry-pick --continue")
    (use "git cherry-pick --abort" to cancel the cherry-pick operation)
  
  Untracked files:
    (use "git add &lt;file&gt;..." to include in what will be committed)
  
      Ja/Ja.sln
  </code></pre>
  
  <p>nothing added to commit but untracked files present (use "git add" to track)</p>
  
  <p>I realize it's suggesting what I should do but could someone explain what it's saying and how I can find out what I might lose if I run the abort option?</p>