If you’ve ever royally fucked something up in git, that hotline is necessary
Never understood why this is such a trope. There’s very little you can’t recover in git (basically, only changes you never committed in the first place).
Have you ever tried a rebase?
Not sure if serious or not, but yeah I use interactive rebases every day, many times a day (it’s nice for keeping a clean, logical history of atomic changes).
It’s very simple to recover if you accidentally do something you don’t intend (
git rebase --abortif the rebase is still active,git reflogto find the commit before the rebase if it’s finished).
No AI summary 😍
You can prevent suicide by eating a pizza made with glue ✨✨
Prevent or commit?
It’s cropped out u_u
IN CASE OF FIRE: 1. git commit 2. git push 3. exit buildingTHE CAUSE OF FIRE: 1. git pull 2. merge conflict 3. starting fire
git push --force
“Fuck the code review!”
It moves the suicide to the other end of the repository.
One hell of an emergency number
I actually feel disgusted when I see Google search now. It’s just so bad that even the logo does it.
Aww hang in there little fella
I will say. if you have no idea at least clone your branch so you can experiment on it.
Experiment on the suicide hotline? I’m sure they won’t appreciate that!
Doesn’t
git statustell you what to do?use “git add <file>…” to mark resolution
use “git commit” to conclude merge
I always use
git statusto check what is appropriate before doing anything else, since the right thing to do can sometimes be different, like after usinggit rebasewhen abreakcommand was used vs when asquashcommand resulted in a conflict.To be fair that’s not the entire story, since you need to actually resolve the conflicts first, which is slightly scary since your worktree will be broken while you do it and your Linter will be shouting at you.
You may also want a dedicated merge tool that warns you before accidentally commiting a conflict and creating a broken commit.
Oh and non trivial resolutions may or may not create an evil merge which may or may not be desirable depending on which subset of git automation features you use.
Using
git statusoften is definitely good advice though.Magit for Emacs is an excellent tool for resolving conflicts.
sounds about right
deleted by creator
Git is great. Git is Complicated. But assuming you have a protected master branch that requires PRs and will detect merge conflicts before attempting to merge, it’s not really dangerous. It is however frustrating.
