Q: You committed with the wrong message — or forgot to add a file to the last commit. How do you fix it without creating a new commit?
Use git commit --amend:
--amend usage and awareness of its implications.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third.""
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: "During a major release branch cut, we encountered this exact scenario and used Git internals to recover cleanly. The interviewer is testing: --amend usage and awareness of its implications.. I structure my answer around systematic triage first, root cause analysis second, and permanent remediation third."
Initial Diagnostics & Root Cause Analysis
Use git commit --amend:
- Fix the message only:
- Add a forgotten file to the last commit:
Remediation & Permanent Safeguards
--amend replaces the last commit with a new one (new SHA). The old commit becomes orphaned and will be garbage-collected eventually. Critical rule: only amend commits that haven't been pushed. If you've already pushed, amending requires a force-push, which rewrites shared history. For pushed commits, create a follow-up commit instead, or use --force-with-lease on your own feature branch if the team agrees.
git commit --amend -m "Correct commit message"
- Fix the message only:
- Add a forgotten file to the last commit:
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 committed wrong message
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 committed wrong message 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 committed wrong message
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 committed wrong message Without branch protection, developers can bypass CI validation gates and push untested code directly to production branches.