Programmer Humor

32373 readers

568 users here now

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

Rules:

Posts must be relevant to programming, programmers, or computer science.
No NSFW content.
Jokes must be in good taste. No hate speech, bigotry, etc.

founded 5 years ago

MODERATORS

[email protected]

499

always try and get my PR merged before anyone else (i.imgur.com)

submitted 1 year ago by [email protected] to c/[email protected]

18 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 19 points 1 year ago (1 children)

Merge conflict in general is fine

What's really bad is if someone drastically changed the implementation of something which you've also changed and if you completely need to rework it…

[–] [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.