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
link
fedilink
English
61Y

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.

Create a post

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.
  • 1 user online
  • 78 users / day
  • 212 users / week
  • 414 users / month
  • 2.93K users / 6 months
  • 1 subscriber
  • 1.53K Posts
  • 33.8K Comments
  • Modlog