title: TFS can't check in changes after replacing file
body: <p>I'm re-writing an Asp.Net project that a colleague had done a prototype version of. I deleted the Default.aspx and created and new one and now I'm trying to check that new version in.</p>
  
  <p>When I try to check in pending changes I get the standard:</p>
  
  <blockquote>
    <p>Check In, No files checked in due to conflicting changes. Please use
    Conflicts Channel to resolve conflicts and try again.</p>
  </blockquote>
  
  <p>I'm re-directed to the Pending Changes - Conflicts tab, where I'm presented with the options: <code>'Take Server Version'</code> or <code>'Keep Local Version'</code>.</p>
  
  <p>If I click <code>'Keep Local Version'</code>, I get the following error:  </p>
  
  <blockquote>
    <p>Error, The following exception was encountered. The item
    $/ProjectName/Default.aspx already has pending changes.</p>
  </blockquote>
  
  <p>How can I get it to accept my new version of the file?</p>