title: How to resolve "delete/modify" conflict caused by "git stash apply"
body: <p>I recently did a <code>git stash</code>, then did some work on the branch and committed it, and got these errors when trying to do a <code>git stash apply</code>:</p>
  
  <pre><code>CONFLICT (delete/modify): app/controllers/orders_controller.rb deleted in Updated upstream and modified in Stashed changes. Version Stashed changes of app/controllers/orders_controller.rb left in tree.
  CONFLICT (content): Merge conflict in app/models/product.rb
  </code></pre>
  
  <p><code>git status</code> shows the following:</p>
  
  <pre><code> $ git status
  # On branch develop
  # Your branch is ahead of 'origin/develop' by 16 commits.
  # Unmerged paths: 
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #   deleted by us:      app/controllers/orders_controller.rb
  #   both modified:      app/models/product.rb
  </code></pre>
  
  <p>The file marked "delete/modify" was a new file that I added and hadn't yet committed before the <code>stash</code>.<br>
  I'd like to be back in the state I was in before the <code>git stash</code> -- having uncommitted local changes.  Can you suggest how to make that happen?</p>
  
  <p>Thanks.</p>