Q: You have local changes in your working directory that you don't want anymore. How do you discard them, and what's the difference between discarding tracked vs untracked changes?
Different commands for different states — and one of them is destructive, so know which:
Want to master this scenario in a live sandbox? KodeKloud's Advanced Git Workflows, Rebase & Interactive Diagnostics covers this exact problem with hands-on terminal drills.
🛠️ Production Runbook & Step-by-Step Resolution
Direct Answer: "In a fast-paced team with dozens of pull requests merged daily, Git workflow hygiene was critical. The interviewer is testing: Understanding of the working tree, staging area, and untracked files.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third."
Initial Diagnostics & Root Cause Analysis
Different commands for different states — and one of them is destructive, so know which:
- Modified tracked files (not staged):
git restore(or older syntaxgit checkout --) reverts the file to what's inHEAD. - Staged changes:
git restore --stagedunstages, leaving the modification in the working tree. Add anothergit restoreto discard it too. - Untracked (new) files:
git restorewon't touch them — Git doesn't know they exist. Usegit clean -fdto delete them. Rungit clean -ndfirst to preview what will be deleted.
Remediation & Permanent Safeguards
These are destructive — there's no undo for working-tree changes that were never committed. When unsure, git stash first; you can drop the stash later if you don't need it.
- Nuke everything back to a clean checkout:
git reset --hard HEAD && git clean -fd.
- Modified tracked files (not staged): git restore (or older syntax git checkout -- ) reverts the ...
- Staged changes: git restore --staged unstages, leaving the modification in the working tree. Add...
- Untracked (new) files: git restore won't touch them — Git doesn't know they exist. Use git clean ...
Senior hiring managers and bar raisers evaluate how you prioritize during outages. Avoid these common anti-patterns:
-
Running raw git push --force rather than git push --force-with-lease on shared team feature branches when configuring Discard Local Changes
git push --forceunconditionally overwrites remote commits made by teammates, whereas--force-with-leaseaborts if the remote ref was updated. - Resolving complex merge conflicts with blind checkout overwrite strategies without running unit tests when configuring Discard Local Changes Unilateral conflict resolution frequently clobbers complementary logic introduced in parallel feature branches, creating regression bugs.
-
Discarding corrupted working directories prematurely instead of recovering lost state using git reflog when configuring Discard Local Changes
git reflogtracks every HEAD movement, allowing instant recovery of discarded commits, botched rebases, or deleted local branches. - Disabling branch protection rules and mandatory PR approval reviews on shared release branches when configuring Discard Local Changes in git-q005-you-have-local-changes-in-your-work Without branch protection, developers can bypass CI validation gates and push untested code directly to production branches.