Stash pop conflicts when the base branch has moved
@connorwhite9▲ 0 net votes
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.