this post was submitted on 26 Aug 2023
1220 points (98.4% liked)

Programmer Humor

32472 readers
1043 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] 109 points 1 year 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.

[โ€“] [email protected] 2 points 1 year ago
load more comments (7 replies)