title: How do I fix a merge conflict due to removal of a file in a branch?
body: <p>I have create a <code>dialog</code> branch and when I try to merge it to <code>master</code> branch.  There are 2 conflicts. I don't know how to resolve <code>CONFLICT (delete/modify)</code>.  Can you please tell me what to do?</p>
  
  <pre><code>$ git checkout master
  $ git merge dialog
  CONFLICT (delete/modify): res/layout/dialog_item.xml deleted in dialog and modified in HEAD. Version HEAD of res/layout/dialog_item.xml left in tree.
  Auto-merging src/com/DialogAdapter.java
  CONFLICT (content): Merge conflict in src/DialogAdapter.java
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>I have opened <code>src/DialogAdapter.java</code>, fixed the conflict and did a <code>git add src/DialogAdapter.java</code>. What else do I need to do?</p>