title: Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled
body: <p>I'm using <a href="http://www.sourcetreeapp.com/">SourceTree</a> as my git tool on Windows.</p>
  
  <p>I have a <em>main</em> branch and a <em>feature</em> branch and I can't get SourceTree to perform a rebase when I have a conflict.</p>
  
  <p><em>main</em> looks like:</p>
  
  <blockquote>
    <p>c1 -> c2 -> c4 -> c5</p>
  </blockquote>
  
  <p><em>feature</em> looks like:</p>
  
  <blockquote>
    <p>c1-> c2 -> c3</p>
  </blockquote>
  
  <p>I want to rebase <em>feature</em> so it will be:</p>
  
  <blockquote>
    <p>c1 -> c2-> c4-> c5-> c3</p>
  </blockquote>
  
  <p>There is a conflict between <em>c3</em> and <em>c5</em>.  I can resolve the conflict, but when I commit the changes I get a <em>HEAD</em> tag and looking at my graph I can see that <em>feature</em> branch wasn't rebased.  </p>
  
  <p>How can I get the rebase to work?</p>