title: Why does cherry-pick always result in a merge conflict?
body: <p>I'm cherry picking specific commits from a release branch into my local working copy.  Every time I cherry-pick a commit from the release branch I get a merge conflict which I have to resolve, even with changes that seem trivial, such as:</p>
  
  <pre><code>-const char kApplicationVersion[] = "Develop";
  +const char kApplicationVersion[] = "Release";
  </code></pre>
  
  <p>being the only change made in the commit to main.cc.</p>
  
  <p><code>git status</code> shows</p>
  
  <pre><code>You are currently cherry-picking commit 6f04be8.
    (fix conflicts and run "git cherry-pick --continue")
    (use "git cherry-pick --abort" to cancel the cherry-pick operation)
  
  Unmerged paths:
    (use "git add &lt;file&gt;..." to mark resolution)
  
      both modified:      src/appMain/main.cc
  </code></pre>
  
  <p>Why is there always a conflict?</p>