title: git rebase --continue no changes
body: <p>I have two branches with two features: <code>banch_1</code> and <code>branch_2</code>.
  <code>branch_2</code> uses feature from <code>branch_1</code>.
  I've made changes in the <code>branch_1</code> and want to rebase <code>branch_2</code> on <code>branch_1</code> to get changes from <code>branch_1</code> into <code>branch_2</code>.</p>
  
  <p>So, I'm checking out on branch_2:</p>
  
  <pre><code>git checkout branch_2
  </code></pre>
  
  <p>And trying to rebase on branch_1:</p>
  
  <pre><code>git rebase branch_1
  </code></pre>
  
  <p>After that I get 'Merge conflict' for two files. So I run</p>
  
  <pre><code>git mergetool -t meld
  </code></pre>
  
  <p>and resolving that conflicts, choosing changes from <code>branch_1</code>. </p>
  
  <p>I'm saving files and going to terminal, typing 
  <code>git status</code> and see that there is no changes in git index. Next I run <code>git rebase --continue</code> and getting </p>
  
  <pre><code>No changes - did you forget to use 'git add'? 
  </code></pre>
  
  <p>error. But there is nothing to add!
  I type <code>git log</code> and see commit from <code>branch_1</code> but there is no commit from <code>branch_2</code>.</p>
  
  <p>What I'm doing wrong?</p>