title: How do I add a deleted file to the index to be committed?
body: <p>I have recently moved a project from SVN to git, and my colleague only just recently deleted all of the old .svn directories.  I attempted to use <code>git pull --rebase</code> in order to have his changes (which were numerous) be added <em>before</em> my own changes.  There was a conflict, and I was able to use <code>git add -A</code> to remove the vast majority of issues.  However, there remains the following:</p>
  
  <pre><code>Unmerged paths:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #   both deleted:       th/protected/modules/rights/views/authItem/.svn/text-base/_childForm.php.svn-base
  </code></pre>
  
  <p>If we've both deleted it, how am I supposed to use <code>git add/rm</code> to add the change to the index?</p>
  
  <p>In short, how does one go about adding a deleted file to the index to be committed?</p>
  
  <p>EDIT:</p>
  
  <p>I have tried to use <code>git rm &lt;filename&gt;</code> on the file, but it does not work it provides the following message:</p>
  
  <pre><code>fatal: pathspec 'th/protected/modules/rights/views/authItem/.svn/text-base/_childForm.php.svn-base' did not match any files
  </code></pre>
  
  <p>EDIT:</p>
  
  <p>Would it be worthwhile to make a dummy file of the same name that I can add to the index?  I don't know what might happen, though, so I am unwilling to do this without a little bit of advice.</p>