Jon Pretty

I'd say it's "unfortunate" that getting myself into a confusing Git state was neither caused by having committed my changes accidentally, nor resolved by `git reset --hard`.

I've seen race conditions caused by multiple git-aware tools pointing at the same repo simultaneously, usually while I rebase or do other weird things. When that has happened to me, the only solution has been manually fiddling with the git filesystem representation.

It's interesting, I was just contemplating exactly this! My confidence in my own ability to mentally track my Git state perfectly doesn't point at this being an explanation... but I know that VS Code is automatically doing some background updates to my Git repo...

By far the most likely explanation is still that I messed up somewhere. I'm much worse at Git than casual observers might guess, so I pin this on human error, but if it happens a few times, I'll start to think about alternative explanations.

But do you have the code you want even if git is in a mess? I’ve sometimes ended up there and copy it somewhere, hard reset and use diff to bring things back in.