this post was submitted on 25 Nov 2023
923 points (97.3% liked)
Programmer Humor
32718 readers
227 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
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Merge conflict
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.
Should've pulled first before starting your work.
Sometimes my work takes a while and other people push in the meantime. Guess I'm dying the fire.
Then you pull before committing.
Boom, merge conflict. The only thing left to me is force push and delete everyone's changes.
Eh, it's probably fine. Those chumps don't do anything useful.
On a push? What are you merging there?
Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew)
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.