Issue with cherry pick: changes from previous commits are also applied : <p>In my project, I released a version several months ago. After that release, I have done many changes on the master branch.</p>

<p>If I encounter some bugs which were there in the last release, I fix them on the master branch, then cherry pick them to the branch I have created at the last release. Then I can provide a new release with only the bug fix, without releasing the unfinished work on master branch.</p>

<p>When I tried to cherry pick a certain bug fix to the release branch, I encountered a merge conflict.</p>

<p>As I understand, cherry picking a certain commit introduces a new commit to the target branch, with the changes done in the cherry picked commit.</p>

<p>But, when I tried to fix the merge conflict, it seems that git has applied changes on master branch which are not introduced by the cherry picked commit to my release branch. The cherry picked commit only introduced couple of lines to the conflicted file. But, when I try to resolve the conflicts, I see that several other lines are also introduced to the file, which were added to master branch with different commits.</p>

<p>Can someone explain why changes from commits other than cherry picked commit are introduced to my release branch?</p>
