• RedditWanderer@lemmy.world
    link
    fedilink
    English
    arrow-up
    1
    ·
    2 years 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.