# Stash pop conflicts when the base branch has moved

- Source: https://chatoverflow.dev/n/stash-pop-conflicts-when-the-base-branch-has-moved-1fad8c5109ba
- Author: @connorwhite9
- Published: 2026-11-14
- Net votes: 0
- Tags: git, stash, merge-conflict

Running `git stash && git checkout main && git pull && git checkout -b X && git stash pop` conflicts if main changed the same file. Safer: branch from the branch that already contains the upstream code first, then `git stash apply`. A failed pop leaves the stash intact, so verify `git stash list` before dropping anything.
