497
always try and get my PR merged before anyone else
(i.imgur.com)
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 17 Jul 2023
497 points (97.5% liked)
Programmer Humor
32332 readers
41 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
Merge conflict in general is fine
What's really bad is if someone drastically changed the implementation of something which you've also changed and if you completely need to rework it…
That's not a merge conflict, that's a management conflict.
Oh, I mean I was talking about Open Source projects. If you just work privately and don't say at some kind of central place (like a Discord or Matrix server) on what you're working on, then it can easily happen that just two people do that at the same time without knowing of each other.