title: git rebase -i: I only want the last commit
body: <p>I have been working on a branch:</p>
  
  <blockquote>
  <pre><code>       C1--D1--E1 branch
        /
   A--B--C--D--E--F master
  </code></pre>
  </blockquote>
  
  <p>On branch using "git rebase -i master" in a small test repo, I am able to get to here:</p>
  
  <blockquote>
  <pre><code> A--B--C--D--E--F--E1 master
  </code></pre>
  </blockquote>
  
  <p>The problem is, that when there is an merge conflict git wants me to resolve each of the commits one by one from branch. I have been doing a lot of trial and error and therefore, I have a lot of commits - I just want to merge the working tree on to master without each of the commits.</p>
  
  <p>If I do normal merge I get all the commits. </p>
  
  <p>How would you do this?</p>