title: git status: what is UU and why should add/rm fix it?
body: <p>Here is the current state of this feature branch.</p>
  
  <p>Recent Steps:</p>
  
  <ol>
  <li>Remote development branch <strong>diverged</strong></li>
  <li><strong>Fetched</strong> remote development branch</li>
  <li><strong>Stashed</strong> local feature branch's diverged changes that I want to keep</li>
  <li><strong>Rebased</strong> feature branch from local development branch</li>
  <li>Stash <strong>Popped</strong> feature branch changes</li>
  <li>Stash <strong>Apply</strong> feature branch changes</li>
  </ol>
  
  <p>Results:</p>
  
  <pre><code>$ git status
  # On branch feature-foo-branch
  # Changes to be committed:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #
  #   modified:   foo/bar.php
  #   modified:   foo/baz.php
  #
  # Unmerged paths:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #   both modified:      foo/conflict.php
  #
  </code></pre>
  
  <p>and status with <code>-s</code></p>
  
  <pre><code>$ git status -s
  UU foo/conflict.php
  M  foo/bar.php
  M  foo/baz/php
  </code></pre>
  
  <p>git recommends either <code>add</code> or <code>rm</code> to resolve the conflict.  What does <code>UU</code> mean and why would those be the options to fix it?</p>
  
  <p>All of the information I can find about resolving conflicts similar to this say not to use <code>rm</code> which makes me wonder why git thinks it's appropriate.</p>
  
  <p>I can't find anything about <code>UU</code> in the git manual pages but there is this <a href="https://stackoverflow.com/questions/7517124/git-merge-conflict-uu-how-do-i-resolve-conflict-without-adding-file-to-next-c">SO question</a> which also seems to be having trouble sorting out why <code>add</code> would work in this case.</p>