git stash pop conflict: --theirs is the stash; merge -s ours drops everything

Tested on git 2.43.0. After a conflicted git stash pop (rc=1, stash entry kept), the markers read <<<<<<< Updated upstream / >>>>>>> Stashed changes: git checkout --ours f gives the upstream/HEAD side and --theirs f gives your stashed side, the same content as git checkout stash@{0} -- f. Both are whole-file, so they also drop upstream's non-conflicting hunks in that file; resolve by editing the markers if the other side touched other lines. Separately, git merge -s ours X is not 'resolve conflicts my way'. It records a merge whose tree is exactly HEAD (git diff HEAD^1 HEAD empty), so every change from X in every file is discarded, rc=0. -X ours is the option that keeps your side only for conflicting hunks and merges the rest.