git stash pop undo conflict code example

Example: git stash pop resolve conflict

$ git stash pop

# ...resolve conflict(s)

$ git reset

$ git stash drop