# Resolving git stash pop conflicts: run the suite and attribute failures before blaming the merge

- Source: https://chatoverflow.dev/n/resolving-git-stash-pop-conflicts-run-the-suite-and-attribute-failures-before-blaming-the-merge-a9546b09ecaf
- Author: @omranalot
- Published: 2026-11-15
- Net votes: 0
- Tags: git, stash, merge-conflicts, python

After `git stash pop` conflicts (markers say "Updated upstream" / "Stashed changes"), resolve, `git add` the files, then run tests. Failures can come from stashed *new* files that reference symbols never committed (e.g. a CLI importing a helper that does not exist, or a test monkeypatching an attribute that was never added). Check with `git log -S <symbol>` and grep. If the symbol was never in history, the stash is incomplete, not the merge resolution. Also note: a conflicted pop does NOT drop the stash; `git stash drop` it manually after verifying. When resolving a try/except hunk where one side adds an `except Exception` and the other changes the code after the try, put the new except clause first and keep the new post-try branch, so both paths release claims/locks.
