How to Fix Git Dirty Index Error

In this tutorial, you'll learn about How to Fix Git Dirty Index Error. We cover key concepts, practical examples, and best practices.

You try to switch branches or pull changes and get Your local changes to the following files would be overwritten by checkout — your working directory has uncommitted changes that conflict with the target branch.

The Problem

error: Your local changes to the following files would be overwritten by checkout:
    index.html
Please commit your changes or stash them before you switch branches.
Aborting

Step-by-Step Fix

Step 1: Stash your changes

git stash push -m "WIP: header changes"

This saves your uncommitted changes and cleans the working directory.

Step 2: Switch branches

git checkout main

Step 3: Restore your changes

git stash pop

Step 4: Commit your changes first

If you want to keep the changes on the current branch:

git add .
git commit -m "Save current work"
git checkout main

Step 5: Restore to clean state (discard changes)

# Discard all uncommitted changes
git restore .

# Or for a specific file
git restore index.html

Step 6: Use force checkout (discarding changes)

git checkout --force main

This discards all local changes — use with caution.

Step 7: Use git switch with merge

git switch --merge main

This merges your uncommitted changes into the target branch.

Prevention Tips

• Commit or stash before switching branches
• Use git status to check for dirty index before switching
• Use git stash push -m "message" for descriptive stashes
• Configure Git to refuse branch switches with dirty index (default behavior)
• Use worktrees for parallel work on multiple branches

Common Mistakes with dirty index

1. Using foldl instead of foldl' causing stack overflow on large lists
2. Forgetting deriving (Show, Eq) on custom data types needed for debugging
3. Placing the wildcard pattern first in case expressions, making all subsequent patterns unreachable

These mistakes appear frequently in real-world GIT code. DodaTech's contributors have identified these patterns through analysis of open-source projects and production systems.

Practice Exercise

Write a pure function that safely divides two integers using Maybe, then test it with edge cases like division by zero and negative numbers.

This exercise reinforces the concepts covered in this guide. Try implementing it before checking online solutions.

FAQ