Git Stash & Worktrees: Managing Multiple Contexts Efficiently

In this tutorial, you'll learn about Git Stash & Worktrees: Managing Multiple Contexts Efficiently. We cover key concepts, practical examples, and best practices.

Git stash temporarily shelves uncommitted changes so you can switch branches, while worktree lets you check out multiple branches in separate directories.

In this tutorial, you'll learn Git stash and worktree — two features that help you manage multiple tasks without losing progress. Every developer faces interruptions: an urgent bugfix while you're mid-feature, or needing to work on two branches simultaneously. By the end, you'll switch contexts cleanly and keep your workflow productive.

flowchart TD
  A[Working on feature] --> B[Urgent bugfix needed]
  B --> C[git stash -u]
  C --> D[Switch to main]
  D --> E[Fix bug, commit, push]
  E --> F[Switch back]
  F --> G[git stash pop]
  G --> H[Continue feature work]

Git Stash: Saving Work in Progress

Use git stash when you need to switch branches but have uncommitted changes:

# Start working on a feature
echo "partial work" > feature.py
git add feature.py
# Oh no, urgent bugfix needed!
git stash

Expected output:

Saved working directory and index state WIP on main: a1b2c3d Initial commit

Your working directory is now clean. Switch to fix the bug, then return and restore:

git checkout main
echo "bugfix" > fix.py
git add fix.py
git commit -m "Urgent bugfix"
git checkout feature-branch
git stash pop

Expected output:

On branch feature-branch
Changes to be committed:
  new file: feature.py
Dropped refs/stash@{0}

Stash Variations

Naming and Selecting Stashes

Give stashes descriptive names:

git stash push -m "WIP: login form validation"
git stash list

Expected output:

stash@{0}: On feature/login: WIP: login form validation
stash@{1}: On main: a1b2c3d Initial commit

Apply a specific stash by index:

git stash apply stash@{1}

Git Worktree: Multiple Branches at Once

Git worktree lets you check out different branches in separate directories simultaneously:

# Add a new worktree for a feature branch
git worktree add ../project-feature feature/login

This creates a directory ../project-feature with the feature/login branch checked out. You can work in both directories without switching.

# List all worktrees
git worktree list

Expected output:

/home/user/project          main
/home/user/project-feature  feature/login

Remove a worktree when done:

git worktree remove ../project-feature

Stash vs Worktree

Common Errors

Practice Questions

Challenge

You're working on a feature branch with 10 modified files (3 staged, 7 unstaged). An urgent hotfix needs your attention. Stash the unstaged changes only, keeping the staged ones. Fix the hotfix on main, commit, then restore your partial work. Write the complete command sequence.

Real-World Task

Set up a Git worktree for a release branch while keeping your main development worktree active. In the release worktree, cherry-pick a bugfix commit from main. Test it, commit, and push. Remove the worktree when done. This mirrors how Linux kernel maintainers handle release branches alongside main development.

Built by the developers of Doda Browser, DodaZIP, and Durga Antivirus Pro.