How to fix error: could not restore untracked files from stash in Git

# The error message typically shows:
# error: could not restore untracked files from stash
# Already exists, no checkout: path/to/file.txt
# Already exists, no checkout: another/file.js

# List the untracked files in your stash
git stash show --include-untracked stash@{0}

# Or show only the untracked portion
git show --name-only stash^3

# Delete the specific conflicting files
rm path/to/file.txt another/file.js

# Now apply the stash
git stash pop

# Show what untracked files are in the stash
git show --name-only stash^3

# Extract specific untracked files to a different path
git show stash^3:path/to/file.txt > path/to/file.txt.stashed

# Or extract to a backup directory
mkdir -p ~/stash-backup
git checkout stash^3 -- . 2>/dev/null || true
# This may fail but you can also use:
git stash show -p --include-untracked | git apply --include-untracked

# Apply tracked changes only (skip untracked)
git stash show -p | git apply

# Create a branch from the stash
git stash branch recovered-changes stash@{0}

# This creates a new branch at the commit where the stash was created
# and applies all stashed changes (tracked and untracked) cleanly

# Now you can merge or cherry-pick changes to your target branch
git checkout main
git merge recovered-changes
# or selectively copy files

# Create a backup directory
mkdir -p ~/backup-before-stash

# Move conflicting files
mv path/to/file.txt ~/backup-before-stash/
mv another/file.js ~/backup-before-stash/

# Apply the stash
git stash pop

# Compare and reconcile files
diff ~/backup-before-stash/file.txt path/to/file.txt

# Check if the stash still exists
git stash list

# If the stash is still there after applying, drop it manually
git stash drop stash@{0}