You must log in or # to comment.
deleted by creator
It is a duplicated repeating error because this clownshow of a website is managed by squirrels and ducks. 1-800-273-8255 would be a valid US number. Doubling 273-8255 is not, but probably vibe coded under management that should be purged by these results.
Well, that’s easy to remember! 0118, 999, 881, 999, 119, 725…3.
Did you see that ludicrious display last night??
Yes I did. Just put it over there with the rest of the fire.
deleted by creator
It’s never too late to
git merge --abort!But abortion is murder?!?!?!?!?
git reset --hard <commit-hash> git push -f origin maini didn’t see anything, officer
You should be forcibly kept away from production systems…
We had an intern do this once. We changed our server config to make sure it wouldn’t accept such operations.
Never use
--force. Always use--force-with-lease.I’ve mistyped that a couple of times to be
--force-with-leashgit push origin master --force-with-leashDon’t do that to your master.
only do that in puppygit (with consent)
TIL thats a real thing https://github.com/catpuppyapp/PuppyGit
git out --never-come-back
calls suicide hotline to ask for tech support
Don’t hold your breath, they’re pretty mid at their actual job.
Jujutsu (which is compatible with git) has a nice conflict resolution flow that doesn’t break you workflow.
Conflicts are encoded into the commits, so that there is never a weird in between state that you have to deal with immediately before being able to do anything else.
Then you can use Jujutsu’s easier history manipulation to resolve the conflict in the conflicted commits.https://steveklabnik.github.io/jujutsu-tutorial/branching-merging-and-conflicts/conflicts.html
And you could always
jj undoif you did something you didn’t want to.Been there too OP. Not a good place.
It’s usually easier to find another job, it will reset your mind, and fear won’t be driving you.
Or you could just commit what you have, comment “YOLO” and auto resolve conflicts and push.
Keep your commits small. Merge often. That will reduce the likelihood of terrible merge conflicts.
If you’re not sharing your work with your team mates for a long time, then you’re setting yourself up for trouble.
Also rebase is usually better than merge.
I remember when similar screenshots circulated for how to tell if i am running jdk or jre, which is even more surprising.
My best friend when I fuck a commit up: https://ohshitgit.com/
I didn’t know about the “revert single file” trick either. The rest is a handy reference too, thanks for sharing!
Google gives you results based on your prior search history.
See I wasn’t really going to kill myself today, but the thought of dialing that long ass number is just to much.
I don’t get why people have such problems with this they even make memes about it.
Have you people never merged anything by hand or what? It’s really not hard.
it’s maybe more annoying in gamedev. textures, models are binary files that can’t be changed line-by-line.
In game dev, a binary file conflict means someone is going to have to do their work a second time.
it’s fine for simple merge conflicts but it quickly gets messy when the two branches are trying to do opposite things to the same code
So cool, I havent seen an ad like this in at least a decade. I use something called an ad blocker and also I switched to Kagi, so… :)
Commit branch…I see your thinking of hanging yourself, here is a link to tying a noose
