Worktrees vs stashing decision in Git - When to Use Which

The Big Idea

What if you could switch tasks instantly without losing your unfinished work or creating a mess?

The Scenario

Imagine you are working on a project and suddenly need to switch to a different task. You have some unfinished changes, but you want to quickly check or work on another branch without losing your current work.

The Problem

Manually saving changes by copying files or creating patches is slow and risky. You might forget to save something or accidentally overwrite your work. Switching branches without saving causes conflicts or lost changes, making you anxious and wasting time.

The Solution

Using worktrees or stashing in Git lets you handle this smoothly. Worktrees let you have multiple working folders for different branches at once. Stashing temporarily saves your changes so you can switch branches safely and come back later.

Before vs After

✗ Before

cp -r project project_backup
# switch branch
rm -rf project
git checkout other-branch
# restore changes manually

✓ After

git stash
# switch branch
git checkout other-branch
# later
git stash pop

What It Enables

You can switch tasks instantly without losing work or creating confusion, making your workflow faster and less stressful.

Real Life Example

A developer is fixing a bug on one branch but gets a request to review code on another branch. Using worktrees, they open the second branch in a new folder and review without disturbing their bug fix.

Key Takeaways

Manual saving and switching is slow and error-prone.

Worktrees allow multiple branches checked out simultaneously in separate folders.

Stashing saves changes temporarily to switch branches safely.