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.
this post was submitted on 11 Oct 2025
466 points (99.2% liked)
Programmer Humor
26817 readers
3181 users here now
Welcome to Programmer Humor!
This is a place where you can post jokes, memes, humor, etc. related to programming!
For sharing awful code theres also Programming Horror.
Rules
- Keep content in english
- No advertisements
- Posts must be related to programming or programmer topics
founded 2 years ago
MODERATORS
No merges allowed. Rebase only.
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.
man \
git
“Proper way to commit after merge conflict” sounds like a robot trying to save a relationship after a bad sex experience
calls suicide hotline to ask for tech support
Don't hold your breath, they're pretty mid at their actual job.
git reset --hard <commit-hash>
git push -f origin main
i didn't see anything, officer
You should be forcibly kept away from production systems...
Never use --force. Always use --force-with-lease.
We had an intern do this once. We changed our server config to make sure it wouldn’t accept such operations.
It’s just a branch guard + properly implementing git user and team permission structures - you’re not “configuring a server”
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.
I prefer to just delete the whole .git and start a new repository with the new version. We are pivoting the project, new name and new repo
If you git help, you could hash things out, rebase your commitments, and push forward to a better life. Then again I could just be cherry picking things.
Holy fuck, that's a long phone number
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.
Hey! Don't insult ducks like that! This clownshow website would be about 20% better if ducks were involved.
I don't know. I was cursing at ducks an hour ago while trying to remember how to spell diatomaceous earth and the ducks were total fuckwits.
Why not 1800-SUICIDE?
intentions unclear. Am I calling For or Against
Your call.
Buh dun tissss
It’s 1-800-APE-TALK
Lmao not willing to do the phone math rn, does that actually fit the numbers?
Yes.
That could be platformed.
WAIT YOU HAVE SO MUCH TO LIVE FOR, have you tried ape talk?
Well, I can't say that I have.
Well, that’s easy to remember! 0118, 999, 881, 999, 119, 725...3.
The irony is, I remember it perfectly.
Did you see that ludicrious display last night??
Yes I did. Just put it over there with the rest of the fire.
Your name is Morris Moss, is it not?
Your name is Morris Moss, is it not?
It is not.
It's easier to remember if you sing it.
A B C D E F G, I hang a noose on this tree. 𝅘𝅥𝅮𝆕
But for real: You should reset hard the head of the git branch, not yours.
It's never too late to git merge --abort!
But abortion is murder?!?!?!?!?
🎶 every branch is sacred 🎶
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 undo if you did something you didn't want to.
git out --never-come-back
git never --gonna-give-you-up
git never --gonna-let-you-down
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 fine for simple merge conflicts but it quickly gets messy when the two branches are trying to do opposite things to the same code
Or 3 branches..
Sounds like agreement and resolution are required pre merge conflict resolve.
Commit branch...I see your thinking of hanging yourself, here is a link to tying a noose