title: How do I resolve git merge conflicts on a submodule from `git stash pop`
body: <p>I have a git repository with a submodule. I need to pop changes I've previously stashed. However, this is causing a merge conflict on the submodule reference.</p>
  
  <p>I want to keep my changes from the stash, except for the submodule. For most code files, I can resolve the conflict by editing the conflicting file, but that doesn't seem to be an option for the submodule.</p>
  
  <p>How can I resolve the merge conflict and still extract my changes from the stash?</p>
  
  <pre><code>$ git stash pop
  warning: Failed to merge submodule some-submodule (commits don't follow merge-base)
  Auto-merging some-code
  Auto-merging some-submodule
  CONFLICT (submodule): Merge conflict in some-submodule
  </code></pre>
  
  <hr>
  
  <pre><code>$ git status
  # On branch some-branch
  # Changes to be committed:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #
  #   modified:   some-code
  #
  # Unmerged paths:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #
  #   both modified:      some-submodule
  </code></pre>