git-stash-pop-pulls-unrelated-stash

What problem does it solve? When you defensively wrap a risky operation with git stash / git stash pop but the working tree is clean, the stash is a no-op and the later pop pulls a stale, unrelated stash from another branch or worktree — often producing merge conflicts in files you never touched. ## Core Features & Use Cases - Root-cause diagnosis: Explains that the stash stack is global, branch-agnostic, and LIFO across all worktrees, so git stash pop always pops stash@{0} regardless of which branch created it. - Prevention patterns: Conditional pop based on stash output, mandatory -m messages for identifiable entries, pre-pop audits with git stash list and git stash show -p, and a throwaway-branch snapshot alternative. - Recovery procedure: Step-by-step cleanup using git reset HEAD, git checkout -- <file>, and verification with git status -s after an accidental pop. - Use Case: You run git stash before checking out a file from another branch, see "No local changes to save", then git stash pop later and suddenly have "both modified" conflicts in files from a months-old feature branch — this Skill walks you through safe recovery. ## Quick Start Ask the assistant to diagnose why git stash pop pulled in files from an unrelated branch and to recover the working tree to a clean state.