title: git merge fails refusing to lose untracked file
body: <p>I am trying to merge a repository on the master. 
  I am getting the following error. </p>
  
  <pre><code>error: refusing to lose untracked file at 'config/database.yml'
  </code></pre>
  
  <p>git status gives me</p>
  
  <pre><code>deleted by us:   config/database.yml
  </code></pre>
  
  <p>How can I resolve that ?</p>