“Git Stash Pop Resolve Conflict” Réponses codées

Git Stash Pop Resolve Conflict

$ git stash pop

# ...resolve conflict(s)

$ git reset

$ git stash drop