this post was submitted on 25 Nov 2023
931 points (97.3% liked)
Programmer Humor
32443 readers
940 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
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.