title: What does git "added by us" mean?
body: <p>After a <code>git rebase</code> I have merge conflicts to solve. I'm confused by the meaning of "added by us" on <code>A.java</code>. What prevents it being automatically added/staged as a new file like <code>C.java</code>?</p>
  
  <pre><code>Changes to be committed:
    (use "git reset HEAD &lt;file&gt;..." to unstage)
  
          new file:   com/company/C.java
  
  Unmerged paths:
    (use "git reset HEAD &lt;file&gt;..." to unstage)
    (use "git add &lt;file&gt;..." to mark resolution)
  
          added by us:     com/company/A.java
          both modified:   com/company/B.java
  </code></pre>
  
  <p>git version 2.5.1.windows.1</p>