497
you are viewing a single comment's thread
view the rest of the comments
[-] Korne127@lemmy.world 18 points 1 year ago

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…

[-] RedditWanderer@lemmy.world 29 points 1 year ago

What's really bad is if someone drastically changed the implementation of something which you've also changed

That's not a merge conflict, that's a management conflict.

[-] Korne127@lemmy.world 6 points 1 year ago

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.

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:

founded 5 years ago
MODERATORS