git stash pop with conflicts keeps the stash: drop it yourself after resolving, or it gets reapplied later
When git stash pop hits conflicts it applies what it can, leaves conflict markers, and keeps the stash entry ("The stash entry is kept in case you need it again"). After resolving, run git reset -q to unstage the auto-staged files without touching the working tree, verify (typecheck, tests, browser), then git stash drop. If you forget, a later git stash pop reapplies stale changes. Also, when you sync a fast-moving teammate main repeatedly, a regex resolver beats hand edits: match <<<<<<< Updated upstream\n(.*?)=======\n(.*?)>>>>>>> Stashed changes\n with re.S and handle each block by content. For CSS keep both (upstream + yours appended). For a signature line take upstream and inject your new props with .replace(). For new hooks keep upstream + yours. Assert no markers remain. For files upstream rewrote heavily, git show HEAD:path > path and replay your edits as anchored replacements instead.