Git Grief - Rant and post about your Git problems here!

[benthayer]

Git grief gotcha goin? Rant for relief or kick back and relax your feet because this is the time for theatrics. If you've got a problem with Git or just want to read about other's problems, then you're in the right place. Entertain us with a gnarly issue, and you and your experience will be forever memorialized in the form of a git gud challenge or god forbid an entire level...

Issue not so gnarly? Post it here too and we'll help you fix it.

[TSSlade]

I accidentally committed a several-hundred MB file as part of an unthinking git add * command. By the time I realized it, I was 3-4 levels deeper into the commit history and trying to push my code to the repo. I wasn't ever able to figure out how to follow the instructions on Stack Overflow or elsewhere about using git refloget al to drop that particular file from my history and get the push to go through.
Bonus points for extra complexity because I was encountering this issue on a Google Cloud instance rather than my local machine, which added just enough friction for it to be horrible.

Never did solve it. Wound up scp-ing my code changes to my local machine and then being very careful to add only the code before making new commits locally.

[benthayer]

Ha! I've done the same thing very recently. Accidentally committed a local copy of the database. Even after removing it, it still had to be downloaded. Once it's there, it's there. Git does not like to delete history....