So today I learned a thing the painful way. Join me in my pain.

• You want to pull a remote git update.
• It won't apply.
• You stash your changes then pull.
• You pop your stash.
• Wild CONFLICT appears!
• You fix the conflict.
• You add the fixed file.
• Wait. Git has held onto the stash. What?
• Maybe it just needs to be applied fully now the conflict is resolved.
• You git stash pop.

And at that point, it destroys all of your work from the last four hours. Oh, and the stash is gone. Oh, and it's not in the reflog either. Fuck you.

I will say this. It is a very good job I have my backups set up. If I'm really really lucky, I've only lost half an hour.

Fucking git.