git stash pop conflict (modify/delete) code example Example 1: git abort stash pop git apply --reverse Example 2: git stash pop abort git reset HEAD --hard