⚡ ~/naveed Interview Prep
⚡ Portfolio Home 👤 About Naveed Bio & Credentials 📫 Contact Naveed Get In Touch ✍️ Engineering Blog Deep Dives 🎯 Interview Hub 1,000+ Scenarios ☸️ Kubernetes Mastery Hub 24 Modules 🎮 DevOps Arcade & Quizzes Subnet Blitz ⚡ 🗺️ DevOps Roadmaps PDFs & Guides 🤖 Morpheus Analysis AI Quant ↗ 🛠️ Developer Tools Utilities 🧪 Labs & Experiments 📄 Interactive CV & Certs 🔗 All Links & Socials ⚡ Join The Dispatch (Weekly SRE Newsletter) →
← Back to All Git & Branching Workflows Interview Questions Scenario 5 of 52 in Git & Branching Workflows
Junior / Associate DevOps [L1] Git Undo, Recovery & History Rewriting Core Fundamentals [L1]
🎯 Target Role / Context: Git Scenario #5 (L1) · Undo, Recovery & History Rewriting

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:

#discard all local changes git #git discard changes #git restore #git clean #Git #L1 #Version Control #Collaboration
🎙️ Candidate Opening & Architectural Context
""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.""
Advertisement
⚡ Recommended Practice Lab

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."

1️⃣

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 syntax git checkout -- ) reverts the file to what's in HEAD.
  • Staged changes: git restore --staged unstages, leaving the modification in the working tree. Add another git restore to discard it too.
  • Untracked (new) files: git restore won't touch them — Git doesn't know they exist. Use git clean -fd to delete them. Run git clean -nd first to preview what will be deleted.
2️⃣

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.
💡 The Senior SRE Gold Nugget (Key Architectural Takeaway)
"Pro-Tip: Modified tracked files (not staged): git restore (or older syntax git checkout -- ) reverts the file to what's in HEAD.."
⚡ 60-Second Elevator Pitch Talking Points
  • 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 ...
⛔ Critical Candidate Mistakes to Avoid in This Scenario

Senior hiring managers and bar raisers evaluate how you prioritize during outages. Avoid these common anti-patterns:

  1. Running raw git push --force rather than git push --force-with-lease on shared team feature branches when configuring Discard Local Changes git push --force unconditionally overwrites remote commits made by teammates, whereas --force-with-lease aborts if the remote ref was updated.
  2. 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.
  3. Discarding corrupted working directories prematurely instead of recovering lost state using git reflog when configuring Discard Local Changes git reflog tracks every HEAD movement, allowing instant recovery of discarded commits, botched rebases, or deleted local branches.
  4. 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.
Advertisement
Want more Git & Branching Workflows scenarios?
Explore our complete collection of scenario-based Git & Branching Workflows interview runbooks.
Browse All Git & Branching Workflows Questions →