this post was submitted on 25 Nov 2023
890 points (96.9% liked)

Programmer Humor

32723 readers
515 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
[–] evilgiraffe666@ttrpg.network 6 points 1 year ago (1 children)

On a push? What are you merging there?

[–] fushuan@lemm.ee 4 points 1 year ago (1 children)

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

[–] evilgiraffe666@ttrpg.network 8 points 1 year 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.