Will files that are skipped in git cherry-pick be included in a later git merge?
<p>I'm working on a project using Moodle 2.9.4</p>

<p>There is some code I would like to cherry-pick from Moodle 3</p>

<p>but I don't want to include some of the files updated in the commits.</p>

<p>Eventually the project will be upgraded to Moodle 3 using git merge</p>

<p>Will the excluded files will be included in the merge?</p>

<p>If not, what's the best solution?</p>