title: Git: remove unwanted untracked files from branch
body: <p>I updated my branch from master and have a few files that were deleted on master, but remain on my local and appear as untracked files. I want to remove these files - ie confirm I don't want them on my local anymore.</p>
  
  <p>I've tried <code>git rm &lt;file&gt;</code> but this does nothing - no message and no changes when I run <code>git status</code>.</p>
  
  <p>I've tried checking out the files from master (<code>git checkout -- &lt;file&gt;</code>) but of course I get a message saying the file doesn't exist on master.</p>
  
  <p>I've tried running <code>git clean -n</code> but I get a lot of messages saying <code>Would not remove &lt;file&gt;</code>.</p>
  
  <p>I also tried deleting the branch <code>git branch -D &lt;branch-name&gt;</code> and pulling in a fresh version, but still get the same merge conflicts.</p>
  
  <p>Would anyone know what I can do?</p>