this post was submitted on 28 Aug 2024
532 points (97.2% liked)

Programmer Humor

32724 readers
159 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 43 points 3 months ago (2 children)

Sometimes I look at the memes around here and wonder wtf y'all are doing. Like, neither my code nor the code at the place I work at are perfect. But I don't think I've ever seen a merge do this. Maybe some of the most diverged merges temporarily had a lot of errors because of some refactoring, but then it was just a few find + replaces away from being fixed again. But those were merges where multiple teams had been working on both the original and the fork for years and even then it was usually pretty okay.

[–] [email protected] 28 points 3 months ago (1 children)
[–] [email protected] 4 points 3 months ago (1 children)

This is true. I got really good at fixing merge conflicts in college

[–] [email protected] 3 points 3 months ago

You kinda have to when half of your "team" is barely even able to write code.

[–] [email protected] 4 points 3 months ago

It's really easy to make a gigantic mess using git if you don't know what you're doing. As soon as you learn to keep your history mostly linear all those issues go away.