• @[email protected]
    link
    fedilink
    English
    451 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
      link
      111 year ago

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