Programmer Humor

32495 readers

632 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]

921

In case of fire (lemmy.world)

submitted 11 months ago by [email protected] to c/[email protected]

74 comments fedilink hide all child comments

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

[–] [email protected] 56 points 11 months ago (9 children)

Merge conflict

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

On a push? What are you merging there?

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

Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew)

[–] [email protected] 8 points 11 months ago

Right, on shared branch you might need to pull first if you're out of date (and you would be if you're all leaving the office at the same time), and that could cause a merge conflict.

It's like I always said, bad branching strategies are a fire safety issue.

load more comments (6 replies)