How do I resolve git merge conflicts on a submodule from `git stash pop`

As the git status comments say: git reset HEAD some-submodule.

By the way, after you've double checked that your tree and index are how they should be, you will probably want to git stash drop. git stash pop would normally do that, but doesn't when there are conflicts.