[Git] Resolve conflicts for git stash pop

Assume you have conflicts after executing git stash pop:

1. Resolve the conflicts manually by yourself
2. Use git reset to mark conflicts as resolved
3. Drop the stash using git stash drop because git doesn’t do it if conflicts occur