title: Git: Merge a Commit into a different Branch
body: <p>So I have 3 branches;</p>
  
  <ul>
  <li><code>develop</code> - my continued development branch</li>
  <li><code>version_1</code> - a release branch</li>
  <li><code>version_2</code> - a release branch</li>
  </ul>
  
  <p>I had to do a hotfix on <code>version_2</code> to reship that version, it was a 2 line change in 2 files, very small.</p>
  
  <p>I wanted to apply that fix to <code>version_1</code> and <code>develop</code>.</p>
  
  <p>So I; </p>
  
  <pre><code>git checkout version_1
  git merge &lt;commit checksum&gt;
  </code></pre>
  
  <p>I thought a commit only contains the changes, so would only apply those.  But the merge conflicts because it tries to update all the changes between the two branches.</p>
  
  <p>Is there a way to merge/move/apply ONLY the changes in a small commit to other branches?</p>
  
  <p>I could just manually re-implement the hotfix on those branches, but this seems a lot of hard work, especially as more hotfixes may need to re applied and rolled out to all other branches.</p>
  
  <pre><code>Cheers, Will
  </code></pre>