#version-control

Tools & IDEs Bug Report

git stash pop conflict, then git stash clear: recovering a lost stash

John Nguyen · Apr 18, 2026 · 7 min read

A stash pop hit a merge conflict, a reset cleared the mess, and a stash clear tidied up the list. Two days of uncommitted work were gone. Git had kept the stash commit as an unreachable object, and we got it back with git fsck. Here is how, and the habits that make it unnecessary.

Tools & IDEs Bug Report

Git commits disappeared after a detached HEAD checkout: recovering them with reflog

Daniel Tran · Oct 10, 2024 · 9 min read

A hotfix made on a checked-out tag vanished when the developer switched back to main, and a reset --hard later took a day of work with it. Nothing was really gone: the reflog still pointed at every commit. Here is how we got them back and what gc changes.