title: Merge features in Git in another branch?
body: <p>We use branches for features which we then merge into <code>master</code>. We also use branches for versions. However, I have a particular feature (merged into <code>master</code>) that needs to go into the version branch. Previously, I had been using <code>cherry-pick</code> for this (manually plucking commits one at a time), but this feature has too many commits to do one at a time. Is there a better way?</p>
  
  <p>This feature has already been merged into <code>master</code>. The branch does not exist locally anymore. However, I do have the commit which resulted from merging it into <code>master</code>.</p>
  
  <p>I am able to restore <code>feature-branch</code> (since we use GitHub). However, from the version branch, when I run <code>git merge feature-branch</code>, I get all sorts of conflicts unrelated to the feature. Same thing happens if I do <code>git rebase feature-branch</code> (from the <code>version-branch</code>).</p>