Gitflow
💢Stash Pop Caused a ConflictMedium+500 XP
Workshop
Scenario reference

Stash Pop Caused a Conflict: the situation, step by step

The situation

You stashed, pulled, and popped. Pop conflict on `config.js`. The stash didn't disappear — Git kept it because pop failed.

Resolve conflict, add, commit (or not). Then `stash drop` cleans up.

Medium · 3 steps · +500 XP

What you will practice

This scenario walks through 3 steps, in order:

  1. 01Try to pop the stash
  2. 02Resolve and stage the conflict
  3. 03Drop the stash since changes are saved
Reveal the step-by-step commands

Try the terminal first — you learn more by doing. When you want to check yourself, here is the command for each step.

  1. 1. Try to pop the stash
    git stash pop
  2. 2. Resolve and stage the conflict
    git add config.js
  3. 3. Drop the stash since changes are saved
    git stash drop

Key takeaway

Pop on conflict keeps the stash. Apply doesn't drop either — that's a feature.

← Browse all scenarios