this post was submitted on 28 Aug 2024
15 points (94.1% liked)

Programmer Humor

32559 readers
680 users here now

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

Rules:

founded 5 years ago
MODERATORS
 
top 15 comments
sorted by: hot top controversial new old
[–] [email protected] 5 points 2 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] 3 points 2 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.

[–] [email protected] 2 points 2 months ago (1 children)
[–] [email protected] 0 points 2 months ago (1 children)

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

[–] [email protected] 1 points 2 months ago

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

[–] [email protected] 2 points 2 months ago (1 children)

I know this is a joke, but those errors/warnings/messages screenshot is not from git. That looks more like results from a compiler of some sort.

[–] [email protected] 0 points 2 months ago* (last edited 2 months ago)

Looks exactly like Visual Studio 2022.

I guess the joke implies that automated (or incorrect manual) conflict resolution causes code that doesn't compile. But still not git's fault. They should probably have merged earlier and in rare cases where that wasn't possible, you have to bite the bullet and fix this stuff.

[–] [email protected] 1 points 2 months ago

I suck at git.
I'm currently rebasing 17k commits into my branch. I'm letting it run overnight.

I'm disgusting.

[–] [email protected] 1 points 2 months ago (2 children)

You need to merge more often.

Rebase. That's where the real trauma is.

[–] [email protected] 1 points 2 months ago

And the branch should be alive a shorter period

[–] [email protected] 0 points 2 months ago (1 children)

Neither rebasing nor merging should cause trauma if everyone on the team takes a day or two to understand git

[–] [email protected] 0 points 2 months ago (1 children)

You and I have very different opinions on what is a reasonable expectation for our respective teams.

[–] [email protected] 0 points 2 months ago (1 children)

You think it's unreasonable for a software developer to take one to two days to learn a tool that's basically ubiquitous in their field?

[–] [email protected] 1 points 2 months ago

No, I think it's a perfectly reasonable thing to do, my coworkers on the other hand...

[–] [email protected] -2 points 2 months ago

If I saw this in my code… I’d just… I’d have a mental breakdown