title: error: Untracked working tree file
body: <p>When I <code>git pull origin development</code>, I got error:</p>
  
  <pre><code>error: Untracked working tree file '&lt;path-to-file&gt;' would be overwritten by merge
  </code></pre>
  
  <p>The reason is because one file which is in the <code>remote development branch</code> is not put to git in my local project (I don't want that file in version control, so did <code>git rm</code>). But on <code>remote development</code>, that file is exit for version control</p>
  
  <p>How to resolve this problem? Basically, I want the remote branch also remove the file from version control.</p>