this post was submitted on 26 Aug 2023
1133 points (98.3% liked)

Programmer Humor

32410 readers
1 users here now

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

Rules:

founded 6 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] divineslayer@lemmy.world 95 points 2 years ago (8 children)

I feel like I often would prefer to get the merge conflict. So many times my coworkers will somehow mess up the code I committed when resolving the conflict.

[–] UndefinedIsNotAFunction@programming.dev 9 points 2 years ago (1 children)

Dear god yes. Please just let me deal with the conflict before the kids make it worse.

[–] fer0n@lemm.ee 3 points 2 years ago

!usernamechecksout@lemmy.zip

load more comments (6 replies)