767
When you screw up git
(lemmy.zip)
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 11 Oct 2025
767 points (99.2% liked)
Programmer Humor
26859 readers
995 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
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.