title: How to deal with xxx~HEAD after git merge?
body: <p><strong>In my branchA:</strong></p>
  
  <p>I copy a file from <code>folder04/config.xml</code> to <code>folder05/config.xml</code>, then <code>git add</code> and <code>commit</code>.</p>
  
  <p><strong>In my branchB (B is branch out from A):</strong></p>
  
  <p>I already have one file named <code>folder05/config.xml</code>.</p>
  
  <p><strong>Now I merge <code>branchA</code> into <code>branchB</code>, it appears a weird conflict like this.</strong></p>
  
  <pre><code>Untracked files:   (use "git add &lt;file&gt;..." to include in what will be
  committed)
  
      folder05/config.xml~HEAD
  </code></pre>
  
  <p>It generates a file named config.xml~<strong>HEAD</strong>, what does it means?</p>
  
  <p>I can't understand why, and what should I do in this situation?</p>