title: Very stange git rebase behavior
body: <p>I'm no Git expert, but I can't understand a strange behavior of the <code>git rebase</code> in my case:<br>
  1. create a local empty git reposiory using <code>git init</code><br>
  2. create a simple text file <strong>file.txt</strong> with the following content:  </p>
  
  <pre><code>111
  222
  333
  </code></pre>
  
  <p>3. add <strong>file.txt</strong> to the index using <code>git add file.txt</code> and commit changes using <code>git commit</code><br>
  4. switch to a new branch using <code>git checkout -b feature</code><br>
  5. change <strong>file.txt</strong> so now it has the following content:  </p>
  
  <pre><code>111
  333
  </code></pre>
  
  <p>6. add <strong>file.txt</strong> to the index using <code>git add file.txt</code> and commit changes using <code>git commit</code><br>
  7. change <strong>file.txt</strong> so now it has the following content:  </p>
  
  <pre><code>111
  444
  333
  </code></pre>
  
  <p>8. add <strong>file.txt</strong> to the index using <code>git add file.txt</code> and commit changes using <code>git commit</code><br>
  9. switch to the master branch using git checkout master; now <strong>file.txt</strong> has the following content:  </p>
  
  <pre><code>111
  222
  333
  </code></pre>
  
  <p>10. change <strong>file.txt</strong> so now it has the following content:  </p>
  
  <pre><code>111
  777
  222
  333
  </code></pre>
  
  <p>11. add <strong>file.txt</strong> to the index using <code>git add file.txt</code> and commit changes using <code>git commit</code><br>
  12. change <strong>file.txt</strong> so now it has the following content:  </p>
  
  <pre><code>111
  777
  222
  888
  333
  </code></pre>
  
  <p>13. add <strong>file.txt</strong> to the index using <code>git add file.txt</code> and commit changes using <code>git commit</code><br>
  14. switch to the feature branch using git checkout feature; now <strong>file.txt</strong> has the following content:  </p>
  
  <pre><code>111
  444
  333
  </code></pre>
  
  <p>15. rebase <strong>feature</strong> branch onto the <strong>master</strong> branch using <code>git rebase master</code>; now I have a conflict in <strong>file.txt</strong> and that file has the following content:  </p>
  
  <pre><code>111
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  777
  222
  888
  =======
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; 2
  333
  </code></pre>
  
  <p>instead of expected:  </p>
  
  <pre><code>111
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  777
  222
  888
  =======
  444
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; 2
  333
  </code></pre>
  
  <p>So my question is: why did the text <code>444</code> disappear from the <strong>file.txt</strong>? Is it ok?</p>