• dukk
    link
    fedilink
    arrow-up
    2
    ·
    2 years ago

    You can get merge conflicts in cherry picks too, it’s the same process.