title: Git - what does CONFLICT (rename/delete) mean?
body: <p>I did not find much success in understanding what this means in other SO questions.</p>
  
  <p>this is for a ruby on rails project. it's probably really straightforward if you know what to do. I tried merging two branches and this was (part) of the result.</p>
  
  <pre><code>CONFLICT (rename/delete): db/migrate/20160705073411_create_building_employees.rb deleted in HEAD and renamed in user-authentication. Version user-authentication of db/migrate/20160705073411_create_building_employees.rb left in tree.
  Removing app/models/buildings_user.rb
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <ul>
  <li>There were a tonne of files which were marked as "modified"</li>
  <li>there was one 'unmerged' path. Namely:</li>
  </ul>
  
  <blockquote>
    <p>added by them: db/migrate/20160705073411_create_building_employees.rb</p>
  </blockquote>
  
  <p>when I opened up the file i saw nothing to really resolve. there were no asterix running across the page.</p>
  
  <ol>
  <li>What does the above mean? </li>
  <li>How do I resolve the issue?</li>
  </ol>
  
  <p>Any advice would be much appreciated.</p>