• @dukk
    link
    211 months ago

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