this post was submitted on 11 Oct 2025
557 points (99.1% liked)
Programmer Humor
26827 readers
2369 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
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
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.
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.