title: why does git give me a CONFLICT error when merging a branch that performed a rename?
body: <p>I have 2 branches in git</p>
  
  <ul>
  <li><code>master</code> </li>
  <li><code>breaking_changes</code></li>
  </ul>
  
  <p>On the <code>breaking_changes</code> branch I renamed a file from <code>user/term_+_bash.sh</code> to <code>dev/gnome-term_+_bash+tmux.sh</code><br>
  I also performed the same rename action (renamed the same file and gave it the same name), but independently on the <code>master</code> branch.<br>
  I then tried to merge in the work from the master branch and I got this</p>
  
  <pre><code>$ git merge master 
  CONFLICT (rename/delete): dev/gnome-term_+_bash+tmux.sh deleted in HEAD and renamed in master.  
  Version master of dev/gnome-term_+_bash+tmux.sh left in tree.
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p><code>git status</code> gives</p>
  
  <pre><code>$ git status
  On branch breaking_changes
  
  You have unmerged paths.
    (fix conflicts and run "git commit")
  
  Unmerged paths:
    (use "git add &lt;file&gt;..." to mark resolution)
  
          added by them:      dev/gnome-term_+_bash+tmux.sh
  
  no changes added to commit (use "git add" and/or "git commit -a")
  </code></pre>
  
  <p>Im not sure what has happened, How can I resolve this conflict?</p>