• sjmulder@lemmy.sdf.org
    link
    fedilink
    arrow-up
    2
    ·
    10 months ago

    We don’t even have that rule with CVS. Sometimes you have a merge conflict after cvs up, well then you fix it. That’s how it’s supposed to work.