title: Disable Git Rename Detection
body: <ol>
  <li>I have a file, <code>foo.txt</code></li>
  <li>Create and checkout branch 'branch_A'</li>
  <li><code>git mv foo.txt bar.txt</code> followed by <code>git add -A</code> then <code>git commit -m "renamed foo.txt"</code></li>
  <li>Checkout master, <code>git checkout master</code></li>
  <li>remove foo.txt and commit.</li>
  <li>Now merge branch_A, <code>git merge branch_A</code></li>
  </ol>
  
  <p>And with this, I get an merge conflict (rename/delete).  </p>
  
  <pre><code>CONFLICT (rename/delete): Rename foo.txt-&gt;bar.txt in branch_A and deleted in HEAD
  </code></pre>
  
  <p>This makes sense and is what I'd expect.  However, I'd like to know if there is a way for git merge to <em>not</em> detect renames, but instead treat them as added/deleted.  In this case, I'd expect git to detect that foo.txt was deleted and simply add bar.txt.  No conflict.</p>
  
  <p>I've tried using -X rename-threshold, but it has not worked for me.  I've tried thresholds 0 and 120 (a number above 100).  What am I missing?</p>
  
  <p>Thanks! </p>
  
  <p>P.S.  I'm also getting <code>error: refusing to lose untracked file at...</code> errors.  What does this mean?</p>