title: Git Merge Conflict - Remote File Deleted, Local File Changed
body: <p>I merged in changes from another branch but I am getting conflicts because a file has been deleted on the remote branch but has changes on local branch.</p>
  
  <p>I would like to delete the file - I tried <code>git rm path/to/file</code> but it says <code>file: needs merge</code>. What is the best way of removing the file and committing the merge?</p>