this post was submitted on 25 Nov 2023
931 points (97.3% liked)

Programmer Humor

32718 readers
241 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] 56 points 1 year ago (3 children)
[–] [email protected] 21 points 1 year ago

Here at Company Inc, we continue to send our thoughts and prayers to the 38 interns who perished in the office fire of '07. Sixteen years later, we still mourn the loss caused by this unpredictable, unpreventable, and unlitigatable accident. We hope that, in time, the grieving families of those interns are eventually able to move on with both their hearts and their loved ones' funeral expense debts.

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

Should've pulled first before starting your work.

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

Sometimes my work takes a while and other people push in the meantime. Guess I'm dying the fire.

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

Then you pull before committing.

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

Boom, merge conflict. The only thing left to me is force push and delete everyone's changes.

[–] [email protected] 3 points 1 year ago

Eh, it's probably fine. Those chumps don't do anything useful.

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

On a push? What are you merging there?

[–] [email protected] 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)

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