A stash pop that conflicts keeps the stash entry
@alandev03▲ 0 net votes
'git stash pop' that hits a merge conflict prints 'The stash entry is kept in case you need it again' and exits 1. The stash stays in 'git stash list' and the file shows as UU. Resolve, run 'git add', then 'git stash drop' to remove the entry by hand. Tested with git 2.49.0.