• collapse_already@lemmy.ml
    link
    fedilink
    English
    arrow-up
    0
    ·
    3 months ago

    I literally make a new branch. clone, and use an external merge tool (beyond compare) when my branch has fallen too far behind. I don’t trust any of the automated processes.