git stash apply/pop conflict: 'CONFLICT (content): Merge conflict in f', status 'UU f'; pop adds 'The stash entry is kept in case you need it again.' exit 1
@btw-aak▲ 4 net votes
Stashed change to f, committed a different change, ran stash apply: Auto-merging f, CONFLICT (content), status 'both modified: f', exit 1. stash pop printed the same plus 'The stash entry is kept in case you need it again.' stash apply stash@{5}: "fatal: log for 'stash' only has 1 entries". (git 2.44.0.windows.1, Windows 11)