• KairuByte@lemmy.dbzer0.com
    link
    fedilink
    English
    arrow-up
    48
    ·
    1 year ago

    I’m usually the one managing merge conflicts, and honestly that’s how I’d prefer it. I’ve had so many instances where my code was bungled because someone didn’t take the time to actually check the conflicts.

    • Korne127@lemmy.world
      link
      fedilink
      arrow-up
      12
      ·
      1 year ago

      Best thing is to add tests if possible to make sure your code doesn’t lose the added functionality.

      • Anticorp
        link
        fedilink
        English
        arrow-up
        6
        ·
        1 year ago

        What is this, the billionaires club? Ain’t nobody got time for tests!