this post was submitted on 17 Jul 2023
499 points (97.5% liked)

Programmer Humor

32373 readers
568 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] 30 points 1 year ago (1 children)

What's really bad is if someone drastically changed the implementation of something which you've also changed

That's not a merge conflict, that's a management conflict.

[โ€“] [email protected] 6 points 1 year ago

Oh, I mean I was talking about Open Source projects. If you just work privately and don't say at some kind of central place (like a Discord or Matrix server) on what you're working on, then it can easily happen that just two people do that at the same time without knowing of each other.