• Korne127@lemmy.world
    link
    fedilink
    English
    arrow-up
    19
    ·
    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
      link
      fedilink
      English
      arrow-up
      32
      ·
      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
        link
        fedilink
        English
        arrow-up
        6
        ·
        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.