title: How could I use a different strategy for just one commit in a rebase?
body: <p>Given this:</p>
  
  <pre><code>master  A---B---G---H---I
               \
  branch        C---D---E---F
  </code></pre>
  
  <p>Is there anyway to get to the following, but using <code>-X theirs</code> <strong>only for the C commit</strong>?</p>
  
  <pre><code>master  A---B---G---H---I
                           \
  branch                    C'--D'--E'--F'
  </code></pre>
  
  <p><em>(I've created a branch for migrating a big solution from VS2008 to VS2010. The first commit on the branch was the one that changed all the project files. Now I would like to update the branch to get the latest changes, but without having to manually merge any conflicts arising from tool-generated code)</em></p>